mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,447 Commits 11 Branches 8 Tags 2.9 GiB
2cbf7c5e41
Commit Graph

4447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muscode
2cbf7c5e41
Update src/data/ability.ts 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-02 11:04:46 -06:00
NightKev
075a14b9cf
Merge branch 'beta' into ability/wimpout 2024-11-02 09:55:11 -07:00
NightKev
8db0d37a2a Minor formatting changes 2024-11-02 09:54:45 -07: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
NightKev
ba4915728f
Merge branch 'beta' into ability/wimpout 2024-11-02 09:02:51 -07: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
muscode
9305b4a3ec
simplify multi hit check 
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
 2024-11-02 09:28:31 -06:00
muscode13
2d52b05b31 added source to damageAndUpdate and applyPostDamageAbAttrs, added Parental Bond logic + test, put applyPostDamageAbAttrs back in damageAndUpdate 2024-11-02 01:33:58 -06: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
muscode13
38b7e6be68 moved applyPostDamageAbAttrs to pokemon.damage, added check for multi lens in pokemon.apply 2024-11-01 21:53:04 -06:00
muscode13
d8c54ff832 added multi-lens logic 2024-11-01 14:37:13 -06:00
muscode13
bf8da089a2 Merge remote-tracking branch 'origin/beta' into ability/wimpout 2024-11-01 11:58:00 -06:00
muscode13
699dbff763 add fix for multi hit move 2024-11-01 11:56:55 -06:00
muscode
747108f5ef
Merge pull request #1 from DayKev/wimpout-patch-1 
Modify `wimp_out.test.ts`
 2024-11-01 11:40:25 -05:00
muscode13
80315d2451 fixed nested if issue, remove trapped tag removal 2024-11-01 11:41:07 -06:00
muscode
20ad144f52
add public override to applyPostDamage 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:34:10 -06:00
muscode
844fbe3d3f
simplify if statement 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:33:38 -06:00
muscode
809e710b87
make applyPostDamage public 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:30:35 -06:00
muscode
0ff40e6b5b
make getFailedText public 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:29:31 -06:00
muscode
bad0494278
make getSwitchOutCondition public 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:29:08 -06:00
muscode
6ef3003528
make switchOutLogic public 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:28:41 -06:00
muscode
596a8b88a5
make getFailedText public 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:27:54 -06:00
muscode
e5a2a64d76
fix whitespace 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:27:26 -06:00
muscode
34343a0941
fix tsdocs 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:20:47 -06:00
muscode
ce0305cf85
fix tsdocs 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:20:19 -06:00
muscode
c6e758ee78
fix tsdocs 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:19:56 -06:00
muscode
d57c800a88
fix tsdocs 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:19:31 -06:00
muscode
bb87a9a92b
remove comment 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:18:57 -06:00
muscode
5761369ab6
remove comment 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:18:35 -06:00
muscode
5df72ee5ef
Update tsdocs 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:18:05 -06:00
muscode
bd199664be
remove extra comment 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:17:30 -06:00
muscode
eb951f2508
remove extra comment 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
 2024-11-01 10:17:05 -06:00
NightKev
fa79c19c30 Modify wimp_out.test.ts 2024-11-01 08:54:29 -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