Lugiad
d86cabd6ff
Merge branch 'beta' into spanish-es-to-eses
2024-10-31 20:24:30 +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
Lugiad
b1b1faf662
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 22:53:25 +01: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
Lugiad
d65b5f170e
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 22:17:45 +01:00
Lugiad
a5243e4eb3
Merge pull request #22 from MokaStitcher/loc-es-es
...
Missing changes to "es-ES" in some UIS
2024-10-29 22:16:50 +01:00
Moka
1b9d29f4bc
change halloween event banner from es to es-ES
2024-10-29 22:11:22 +01:00
Moka
e6be838b91
change remaining 'es' to 'es-ES' in various UIs
2024-10-29 22:00:24 +01: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
Lugiad
2e823c9863
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 19:23:14 +01:00
Lugiad
307a56d6b0
Update timed-event-manager.ts
2024-10-29 19:22:53 +01:00
Lugiad
8ec774533e
Update loading-scene.ts
2024-10-29 19:22:36 +01:00
NightKev
13ff80fb95
Mark Last Respects as partial ( #4749 )
2024-10-29 18:59:28 +01:00
Lugiad
b0a73b51e3
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 18:15:42 +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
Lugiad
b840191c20
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 17:36:36 +01: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
Lugiad
ac5c79a953
Merge branch 'beta' into spanish-es-to-eses
2024-10-29 00:43:58 +01:00
AJ Fontaine
13377806ff
[Refactor] Change attack type booster names to enum ( #4725 )
2024-10-28 15:58:46 -07:00
Lugiad
1a2232881a
Merge branch 'beta' into spanish-es-to-eses
2024-10-28 21:57:34 +01: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
Lugiad
dce4c4c75b
Merge branch 'beta' into spanish-es-to-eses
2024-10-28 19:23:35 +01:00
Moka
fe7d156d2d
Merge pull request #4754 from pagefaultgames/main
...
Main -> Beta (1.1.6)
2024-10-28 17:40:48 +01:00
Lugiad
0e33d3b2b8
Update settings-display-ui-handler.ts
2024-10-28 16:28:04 +01:00
Lugiad
62d0068d4c
Update utils.ts
2024-10-28 16:09:53 +01:00
Lugiad
ddfc0d258d
Update starter-select-ui-handler.ts
2024-10-28 16:09:23 +01:00
Lugiad
7a87c6a19d
Update settings-display-ui-handler.ts
2024-10-28 16:08:12 +01:00
Lugiad
ca904c337b
Update settings.ts
2024-10-28 16:06:37 +01:00
Lugiad
28c9dca1dd
Update i18n.ts
2024-10-28 16:04:45 +01:00
Lugiad
8a1dcfd97e
Rename types_es.png to types_es-ES.png
2024-10-28 16:02:23 +01:00
Lugiad
fcd14643e4
Update and rename types_es.json to types_es-ES.json
2024-10-28 16:02:14 +01:00
Lugiad
30394bb0bc
Rename statuses_es.png to statuses_es-ES.png
2024-10-28 16:01:53 +01:00
Lugiad
afcb619280
Update and rename statuses_es.json to statuses_es-ES.json
2024-10-28 16:01:41 +01:00
Moka
cab74f78aa
Main -> Beta (1.1.6) ( #4751 )
...
* Comment out startGame call on manifest fetch failure
* [Hotfix] Fix status damage triggering before berry usage (#4732 )
* [Hotfix] Fix Eternatus egg tier (#4734 )
* [Hotfix] Fix manifest getting loaded before the game is initialized (#4739 )
* fix locales path for offline builds (#4739 )
* [Sprite] Hotfix cut off Binacle sprite (#4741 )
* [Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743 )
* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja
* [Hotfix] Fix crash when Mist would block a stat drop (#4746 )
---------
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: pom-eranian <lrlrliwoo@gmail.com>
2024-10-28 14:10:45 +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
