NightKev
af473ba4ff
[Refactor] Clean up various methods in battle-scene.ts and pokemon.ts ( #4412 )
...
* Update `battle-scene.ts` and `data/field/pokemon.ts`
`battle-scene.ts` changes:
- `getParty()` renamed to `getPlayerParty()` for clarity
- `getNonSwitchedXPokemon()` consolidated into `getXPokemon()`
- Some tsdocs were added/updated for
`getXParty()`, `getXField()` and `getXPokemon()`;
and those functions were explicitly marked as `public`
- Helper function `getPokemonAllowedInBattle()` added
`pokemon.ts` changes:
- `isAllowed()` renamed to `isAllowedInChallenge()` for clarity
- A redundant check for an active scene is removed in `isActive()`
- Some tsdocs were added/updated for `isFainted()`,
`isAllowedInChallenge()`, `isAllowedInBattle()` and `isActive()`;
and those functions were explicitly marked as `public`
- `isFainted()` now checks for `hp <= 0` instead of `!hp`
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Backport eslint change to reduce merge conflicts
* Fix merge issues
---------
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-11-03 21:53:52 -05:00
Tempoanon
87b7122b60
[P2] Illuminate ignores evasion ( #4781 )
2024-11-03 21:47:07 -05:00
NightKev
5e2dfa975a
Rename PokemonTurnData's damageDealt and currDamageDealt ( #4784 )
2024-11-03 14:09:28 -08:00
muscode
f0ae36de6c
[Ability] Implement Wimp Out and Emergency Exit ( #4701 )
...
* implement Wimp Out/Emergency Exit
* fixed test
* fixed weather bug
* Added nightmare interaction to Wimp Out following bug fix
* refactored and added postdamageattr
* bug fixes
* added confusion test back (skipped)
* updated applyPostDamageAbAttrs to applyPostDamage
* fix external func name
* fixed syntax inconsistency
* updated PostDamageForceSwitchAttr -> PostDamageForceSwitchAbAttr
* Modify `wimp_out.test.ts`
* remove extra comment
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* remove extra comment
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update tsdocs
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* remove comment
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* remove comment
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix tsdocs
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix tsdocs
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix tsdocs
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix tsdocs
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fix whitespace
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* make getFailedText public
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* make switchOutLogic public
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* make getSwitchOutCondition public
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* make getFailedText public
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* make applyPostDamage public
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* simplify if statement
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* add public override to applyPostDamage
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* fixed nested if issue, remove trapped tag removal
* add fix for multi hit move
* added multi-lens logic
* moved applyPostDamageAbAttrs to pokemon.damage, added check for multi lens in pokemon.apply
* added source to damageAndUpdate and applyPostDamageAbAttrs, added Parental Bond logic + test, put applyPostDamageAbAttrs back in damageAndUpdate
* simplify multi hit check
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* Minor formatting changes
* Update src/data/ability.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* moved and renamed shouldPreventSwitchOut, rewrote tests to account for U-turn changes, fix syntax error
* Move comment slightly
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-11-03 01:04:20 -05:00
podar
b17b1d6e7e
[P1] Fixing crash that can occur when failing to loading variant sprites. ( #4315 )
2024-11-03 01:33:48 -04:00
Mumble
f16309fd06
[P2] Plus, Minus, Beads/Sword of Ruin not ignorable. Shield Dust and Armoa Veil ignorable ( #4778 )
...
Co-authored-by: frutescens <info@laptop>
2024-11-03 01:22:40 -04:00
Mumble
70ddc29e86
[Refactor] Refactor data/pokemon-species.ts ( #4054 )
...
* Setting species-variables to read only
* set generations to protected
* formIndex set to protected
* quick fix
* typedocs fixes
* get / set generation
* wait
* Use get/set for formIndex too
* Fix misplaced line
* Replace a couple `!!` with default params
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-11-02 23:11:24 -04:00
Mason S
c31657d952
[Refactor] Reduced nesting in MoveEffectPhase ( #3541 )
...
* Re-structured MoveEffectPhase.run() to reduce nesting and improve readability.
* Re-structured MoveEffectPhase.run() to reduce nesting and improve readability.
* Added Substitute Implementation
* Fix indentation, tsdocs, add `public`/etc
* Prevent ENEMY_SIDE targeted moves from occurring twice in double battles
* Add `override` to `start()` and `end()`
* Minor indentation fix
---------
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-11-02 22:55:15 -04:00
innerthunder
1474f8cf14
[Refactor] Add options param interface for MoveEffectAttr ( #4710 )
...
* Optional parameter interfaces for `MoveEffectAttr` and `StatStageChangeAttr`
* Update docs + Diamond Storm typo
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Make move effect trigger specification optional
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-11-02 13:05:33 -04:00
Mumble
1659f57262
[P2] Camouflage now considers Terrains first ( #4761 )
...
* the fix... will maybe write a test later
* ughh
* made a test
* moved aorund function
* Update src/test/moves/camouflage.test.ts
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
* lalal
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-11-02 12:48:10 -04:00
innerthunder
80a8c659ee
[P2] Add "no switch-in" fail condition for Shed Tail and Baton Pass ( #4777 )
2024-11-02 12:47:08 -04:00
Moka
c2d24d6e93
[Bug] Take weight into account when getting the tier of a modifier ( #4775 )
...
* disable timed events in tests
* Take weight into account when getting the tier of modifiers
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-11-02 11:55:22 -04:00
AJ Fontaine
8169760e1e
[Bug] Prevent wild mons fleeing with U-turn, Flip Turn, Volt Switch ( #4643 )
...
* Wild mons can't flee with U-turn
* Update src/data/move.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-11-01 21:21:45 -07:00
PrabbyDD
34d2a9c400
Merge branch 'beta' into prabbydMirrorArmor
2024-10-31 16:26:34 -07:00
PrabbyDD
25da81d4af
beginnings of implementation of mirror armor
2024-10-31 16:17:46 -07:00
Mumble
684fb93e39
the fix ( #4733 )
...
Co-authored-by: frutescens <info@laptop>
2024-10-31 22:22:26 +01:00
Lugiad
abc9264b3d
[Localization] Spanish modification form es to es-ES ( #4753 )
...
* Update and rename statuses_es.json to statuses_es-ES.json
* Rename statuses_es.png to statuses_es-ES.png
* Update and rename types_es.json to types_es-ES.json
* Rename types_es.png to types_es-ES.png
* Update i18n.ts
* Update settings.ts
* Update settings-display-ui-handler.ts
* Update starter-select-ui-handler.ts
* Update utils.ts
* Update settings-display-ui-handler.ts
* Update loading-scene.ts
* Update timed-event-manager.ts
* change remaining 'es' to 'es-ES' in various UIs
* change halloween event banner from es to es-ES
* update to latest locale commit
---------
Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2024-10-31 21:54:05 +01:00
Madmadness65
5755180279
[Audio] Replace Graveyard BGM with Firel's custom BGM ( #4765 )
2024-10-30 21:48:09 -04:00
PigeonBar
5b9dfe17ad
[P2] Fix Own Tempo Rockruff not being able to evolve ( #4762 )
2024-10-30 13:15:11 -04:00
Mumble
b3a0ca9475
[Misc] Update Donation Link ( #4763 )
...
Co-authored-by: frutescens <info@laptop>
2024-10-29 19:31:24 -07:00
PrabbyDD
15dedf06ed
[P2] No Exp Gained after Switching in a Pokemon as the Opponent Faints ( #4687 )
...
* fixing the exp bug
* fixing the exp bug
* dont think need to reset turn data there
* changing a little bit
* Update src/phases/faint-phase.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
---------
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-10-29 17:38:57 -04:00
PrabbyDD
afe6d2900d
[P2] Fix for Speed Boost is Activated on the Turn a Pokemon is Switched In, and When a Pokemon Fails to Escape #4353 ( #4676 )
...
* fixing speed boost for pokemon being switched in and for if failed escape
* adding unit tests
* adding failed run away test case
* adding failed run away test case modification
* refactoring solution to be more consistent with coding style
* more fixes for consistency
* more fixes for consistency
* adding new AbAttr in abiliity.ts for posterity
* removing uneccesary variables
* fixing a merge conflict
2024-10-29 17:38:33 -04:00
innerthunder
fd1aa41d09
[P2] Fix AI targeting allies with status effect moves ( #4717 )
2024-10-29 17:32:07 -04:00
NightKev
921d4fa18c
[P2] Chloroblast & Struggle should not recoil if the move failed ( #4719 )
...
* Chloroblast & Struggle should not recoil if no damage was dealt
* Protect against missing move entry
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
---------
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
2024-10-29 17:31:37 -04:00
AJ Fontaine
f9fe59239e
[TMs] Remove Sacred Sword, add Secret Power TM, fix Reflect compatibility ( #4713 )
2024-10-29 17:31:02 -04:00
Opaque02
1cbe8b1505
[P3] Fixing form name being incorrect for some evolved pokemon ( #4742 )
...
* Fixing form name being incorrect for some evolved pokemon
* Updated to include showing the root speciesId if the speciesId locale key doesn't exist
2024-10-29 17:30:20 -04:00
Blitzy
65269f935f
[Balance] Change Bouncy Bubble's Attributes ( #4757 )
...
* Change Bouncy Bubble's Healing
* Move comment to what is custom about Bouncy Bubble
---------
Co-authored-by: damocleas <damocleas25@gmail.com>
2024-10-29 16:19:42 -04:00
NightKev
13ff80fb95
Mark Last Respects as partial ( #4749 )
2024-10-29 18:59:28 +01:00
Mumble
fb2d3e45d6
[Move][Ability] Fully Implement Forest's Curse / Trick Or Treat / Mimicry ( #4682 )
...
* addedType variable
* basic mimicry implementation
* eslint
* rage
* quick change
* made files
* added mimicry activation message
* test for moves done
* hahahhaha
* done? for now?
* laklhaflhasd
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* time to start... ughhh
* reflect type
* Added new message
* Update src/field/pokemon.ts
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* added overrides
* some checks
* removed comments
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-10-29 10:10:37 -07:00
geeilhan
38a6bf07e3
[Bug] Fix enemy faint causing Frenzy moves to mishandle paralysis ( #4680 )
...
* [BUG] Added frenzy reset function during move phase should move be cancelled (#4227 )
* Revert [P2 BUG] Fix since it does not work and is faulty
* [P2 BUG] Implemented correct frenzy Tag and Movequeue reset should frenzy move fail (#4277 )
* Cleaned up Bug Fix using frenzyMissFunc
* Added automated test case for frenzy move edge case
* Improvement to frenzy move reset test case speed
* Fix test
* Add missing import
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-29 08:36:24 -07:00
AJ Fontaine
13377806ff
[Refactor] Change attack type booster names to enum ( #4725 )
2024-10-28 15:58:46 -07:00
PrabbyDD
3241332a3c
[Ability] Implementing Friend Guard ( #4718 )
...
* implementing friend guard ability
* Update src/data/ability.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/data/ability.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/test/abilities/friend_guard.test.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Update src/field/pokemon.ts
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
* more tests and fixing other issues
* more tests and fixing other issues
* Update Friend Guard test with damage mocks
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: innerthunder <brandonerickson98@gmail.com>
2024-10-28 13:49:04 -07:00
Moka
fe7d156d2d
Merge pull request #4754 from pagefaultgames/main
...
Main -> Beta (1.1.6)
2024-10-28 17:40:48 +01:00
innerthunder
b4cc9d7892
[Hotfix] Fix crash when Mist would block a stat drop ( #4746 )
...
* Fix crash when Mist would block a stat drop
* Bump version
* Bump version (again)
2024-10-28 14:02:10 +01:00
pom-eranian
5797f265a4
[Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja ( #4743 )
...
* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja
* bump version number
2024-10-28 02:32:36 +00:00
chaosgrimmon
33f5f4c33b
[Sprite] Hotfix cut off Binacle sprite ( #4741 )
...
* Trim 688.json duration
* Trim 688.json duration
* Fix cut off Binacle back
* Fix cut off shiny Binacle back
* Bump version
* Bump version
* Revert cutting off hair
* Revert cutting off hair
* Remove trailing comma
* Remove trailing comma
2024-10-27 23:23:09 +01:00
Moka
41380b39b9
[Hotfix] Fix manifest getting loaded before the game is initialized ( #4739 )
...
* Fix manifest being used before the game is initialized
* bump game version
* make manifest fix more future proof
* Revert "make manifest fix more future proof"
This reverts commit 32591b35d0
2024-10-27 21:32:30 +01:00
PigeonBar
dfb42e44a6
[Hotfix] Fix Eternatus egg tier ( #4734 )
2024-10-27 04:04:57 +00:00
innerthunder
9a56f080db
[Hotfix] Fix status damage triggering before berry usage ( #4732 )
...
* Fix status damage triggering before berry usage
* Bump version number
* Revert "Bump version number"
This reverts commit 64b194f5a7
2024-10-27 02:34:48 +00:00
Frederico Santos
908784b011
Merge branch 'main' of github.com:pagefaultgames/pokerogue into pokerogue-main
2024-10-26 22:43:47 +01:00
Frederico Santos
a9a73863e8
Comment out startGame call on manifest fetch failure
2024-10-26 22:43:15 +01:00
Frederico Santos
78adade5c3
Merge pull request #4730 from pagefaultgames/beta
...
1.1.0 - The Halloween Update
2024-10-26 22:29:58 +01:00
Moka
22865c010a
fix oversight with save migration ( #4731 )
2024-10-26 22:16:37 +01:00
Madmadness65
4fb1f37baa
[Sprite] Fix Berry Juice item sprite
...
Sprite will now be centered properly.
2024-10-26 16:13:05 -05:00
Frederico Santos
61193562f1
Updated date
2024-10-26 21:30:05 +01:00
pom-eranian
4be0214d5a
[fix] added missing rare icons for spinarak, ariados. added to icon sheet ( #4729 )
2024-10-26 21:09:19 +01:00
pom-eranian
39362389c7
[Sprite] October Variant Update ( #4608 )
...
* 40 Wigglytuff (base fix) @ hanniel
* 39 40 174 variant icons
* 39 40 174 - Variant Palettes
* 359 - Absol Mega Absol [Base Fixes] - @ rival_kieran
* 359 Absol Variant icons
* 359 Absol Variant palettes
* 359 Absol [_masterlist.json]
Enabled variants for absol & mega absol
* [Sprite][Anim] 275 Shiftree- cropped ear fix - @hamez
* Honchcrow Murkrow [Base fixes]
* Murkrow Honchkrow - Icons for variant & female murkrow
* 198 430 Murkrow Honchkrow Variants [Epic Rare]
* [fix] 359 - masterlist - removed ghost entry for exp absol
* 527 528 Woobat Swoobat [Epic Rare] @ rival_kieran
base fix on woobat back, swoobat front, back
palette files for front, back
added to masterlist
variant icons
* [fix] masterlist -removed incorrect entry
* 590 591 Foongus Amoongus @ Omniv
variant icons
variant palettes
fixes for base front and back
* 587 Emolga [Rare Epic] @ bagonganda
icons variants
front back base fix
variant palettes
* [fix] masterlist Added missiing variants. Added Qwuilfish variants
Qwilfish icons
variant palettes
Enabled variants for pokemon in title.
39 40 174 Jigglypff Wigglytuff Igglybuff
587 Emolga
211 Qwilfish
* 377 378 379 486 894 895 Regirock Regice Registeel Regigigas Regieleki Regidrago @greenninja757 @_vari_ @splashceles @gonfold @sphinx_sage
variant icons
variant palettes
base fixes for regigigas, regieleki & registeel
added all to masterlist
* 684 685 Swirlix Slurpuff [Rare Epic] - @ gerolau
* 682 683 - Sprizee Aromatisse [Rare Epic] - @ Koda_want_to_sleep
* 378 Regice [Base shiny + replacement] - @ Vari
* 501 502 503 6503 - Oshawott Dewott Samurott [Base Fix Rare Epic] - @Omniv @yepitscaio
* 152 153 154 - Chikorita Bayleef Meganium [Base Fix Rare Epic] - @ corsola_bandit
* 807 Zeraora [Epic Rare] - @ luckyluckylucky
* 194 195 Wooper Quagsire [Rare Epic] - @ OfficerPorkchops
cleaned up wooper's face
variant icons
added to masterlist
palette files
* 616 617 Shelmet Accelgor [Base fix, Rare, Epic] - @ Vari
shelmet base fixes
variant icons
variant palettes
added to masterlist
* 588 589 Karrablast Escavalier [Rare, Epic] - @ Vari
variant palettes
variant icons
added to masterlist
* 170 171 Chinchou Lanturn [Rare, Epic] - @ thetruegge
variant icons
variant palettes
added to masterlist
* 158 159 160 Totodile Croconaw Feraligatr [Rare, Epic] - @ Dingosig @ Ashhawk
variant icons
variant palettes
added to masterlist
* [128] Tauros [Rare Epic] - @ Bibble
variant icons
variant palettes
added to masterlist
* 509 510 Purrloin Liepard [Basefix, Rare, Epic] - @ MeganiumOpus
variant icons
variant palettes
base fix 510 liepard
added to masterlist
* 390 391 392 Chimchar Monferno Infernape [Base Fix, Rare, Epic] @ hanniel.15
base fix all
variant icons
variant palettes
added to masterlist
* [fix] masterlist erroneous value on chinchou, lanturn
* 455 Carnivine [Base Fix Rare Epic] - @ hamez
base fix for front, back
variant icons
variant palettes
added to masterlist
* 944 945 Shroodle Grafaiai [Base fix, Shiny fix, Rare, Epic] - @ Vari
* 167 168 Spinarak Ariados [Rare, Epic] - @ Thorn @ wormhood
* 676 Furfrou [BaseFix Rare Epic] - @ gerolau
* Variant removed 509 510 Purrloin Liepard
This reverts commit 90ab203708
2024-10-26 18:06:07 +01:00
Frederico Santos
51b2a4d7fe
Something ( #4728 )
...
* [Feature] Add event-based friendship multiplier and update TrainerConfig for event modifiers
* [UI][Dev] Improve event banner placement (#4726 )
* [ui] automatically place event banner and timer in the title screen
* add new event banner
* ugh
* [Refactor] Clean up TrainerConfig and remove unused timed event
---------
Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com>
2024-10-26 17:14:17 +01:00
Smewkie
61cf937cab
[Balance] Ferroseed HA
...
Ferroseed HA
2024-10-26 00:38:12 +01:00
PigeonBar
f87ac116fa
[Beta] Stop Transform giving copied moves negative fractional ppUp ( #4722 )
...
* [Beta] Stop Transform giving copied moves negative fractional `ppUp`
* Remove some bangs/etc
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-10-25 19:34:40 -04:00
