Commit Graph

4171 Commits

Author SHA1 Message Date
Mumble
1728e69130
Update src/data/arena-tag.ts
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-09-25 13:09:41 -07:00
flx-sta
caf0faddb0
Merge branch 'beta' into restrictionMoves 2024-09-25 07:17:02 -07:00
NightKev
43879b4751
[Item] Eviolite no longer spawns for GMax pokemon (#4409) 2024-09-25 10:16:03 -04:00
Chapybara-jp
e53e175813
[Localisation] [JA] Minor corrections to settings, achv, tutorial; added necessary possessive particle to all trainer-classes (#4415)
* Update ability-trigger.json

* Update ability.json

* Update arena-flyout.json

* Update arena-tag.json

* Update battle.json

* Update fight-ui-handler.json

* Update berry.json

* Update menu.json

* Update party-ui-handler.json

* Update starter-select-ui-handler.json

* Update tutorial.json

* Update move.json

* Update battle.json

* Update arena-flyout.json

* Update arena-flyout.json

* Update arena-tag.json

* Update party-ui-handler.json

* Update settings.json

* Update move-trigger.json

* Translate modifier-type.json

* Update modifier-type.json

* Translated modifier-type.json

* Update move-trigger.json

* Update move-trigger.json

* Update move-trigger.json

* Update modifier-type.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue-misc.json

* Update dialogue.json

* Update dialogue-misc.json

* Update dialogue-misc.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

Archers and Arianas dialog taken from Pokemon Stadium 2, HGSS, LGP/LGE, FRLG

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update menu.json

* Update dialogue.json

* dialogue.json

* Update dialogue-final-boss.json

* Update dialogue.json

* Update dialogue.json

* Update dialogue.json

* Update settings.json

* Update tutorial.json

* Update tutorial.json

* Update trainer-classes.json

* Update achv.json
2024-09-25 10:13:51 -04:00
damocleas
ed10152fb4
[Enhancement] Add New Splash Text (#4358)
* Splash Text Changes 1

* fix some commas, adjust two halloween texts

* adjustments

* Capitalization / Grammar from English

* fixes

* Update splash-messages.ts to match

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 16:13:22 +02:00
ImperialSympathizer
fa55ab6d26
[Beta/Bug] Fix Breeders ME Dialogue Token Issue (#4411)
* revert styled dialogue

* revert styled dialogue

* revert styled dialogue

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-25 04:08:46 -04:00
frutescens
d9eb760be5 Prevents test pokemon from being immune to torment 2024-09-24 21:21:51 -07:00
frutescens
40960b8098 tsdocs 2024-09-24 21:07:44 -07:00
Mumble
c0a0ab3572
Update src/test/moves/torment.test.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-24 20:59:42 -07:00
frutescens
6220457a80 Marked Torment as partial 2024-09-24 20:58:33 -07:00
Mumble
3d0603ddf1
Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-24 20:45:08 -07:00
frutescens
789416e006 forget to remove partials for heal block 2024-09-24 19:59:17 -07:00
Mumble
f900c5ebfe
Update src/data/arena-tag.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-24 17:08:54 -07:00
frutescens
dca0ec6051 Handling undefined 2024-09-24 15:32:37 -07:00
frutescens
f7b759ca7d privated retrieveField 2024-09-24 15:27:19 -07:00
frutescens
03ace56dc4 quick docs 2024-09-24 15:16:57 -07:00
frutescens
a0c8b2818f flx fixes 2024-09-24 15:14:42 -07:00
Mumble
c74b1ad190
Update src/data/arena-tag.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-24 15:08:57 -07:00
frutescens
8b8f20bf37 flx - adding overrides 2024-09-24 15:08:40 -07:00
frutescens
eef1f82dfc Flx Change 2024-09-24 14:21:16 -07:00
frutescens
25b27e8d34 Imports 2024-09-24 14:17:21 -07:00
flx-sta
9af89414b9
[Refactor][Localization] Better handling for StatusEffect.NONE with i18n (#4405)
* remove: `StatusEffect.NONE` from displaying any messages

even thougn this case will never occur, by code definition it should be covered

* remove: obsolete `statusEffect:none.` translation keys

* fix: status-effect test

* chore: undo overrides commit (whops)
2024-09-24 14:15:18 -07:00
frutescens
7c3b888208 documentation blah 2024-09-24 14:10:55 -07:00
flx-sta
070c710667
Merge branch 'beta' into restrictionMoves 2024-09-24 13:52:22 -07:00
frutescens
542ac83dfd Final tests before documentation 2024-09-24 13:48:32 -07:00
frutescens
c1a2b76800 Tests 2024-09-24 13:47:52 -07:00
frutescens
11de99b43c Imprison and Taunt Tests 2024-09-24 13:16:33 -07:00
ImperialSympathizer
254ffcf6d6
Merge pull request #4374 from ben-lear/mystery-encounter-fixes
[Beta][Bug/Balance] Mystery Encounter bug fixes and small balance adjustments (part 3)
2024-09-24 15:45:27 -04:00
Mumble
1f09561518
Merge branch 'beta' into restrictionMoves 2024-09-24 12:21:25 -07:00
flx-sta
969b0ea531
Merge branch 'beta' into mystery-encounter-fixes 2024-09-24 11:14:00 -07:00
ImperialSympathizer
d52f691d43 account for undefined egg moves 2024-09-24 14:06:59 -04:00
ImperialSympathizer
219215f54c fix getEggMoves() helper function 2024-09-24 13:51:02 -04:00
ImperialSympathizer
a1d1de2c0d more ME dialogue cleanup 2024-09-24 13:41:00 -04:00
ImperialSympathizer
24bbb0931c change return type of isNullOrUndefined 2024-09-24 13:15:18 -04:00
Tempoanon
baa806ec63
[Beta][P3 Bug] Fix typo in autotomize add message (#4404)
`pokemonNameWIthAffix` -> `pokemonNameWithAffix`
2024-09-24 11:45:29 -04:00
ImperialSympathizer
6dc1aedb8e more ME balance changes and bug fixes 2024-09-24 11:34:42 -04:00
ImperialSympathizer
0262635abb Merge branch 'beta' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes 2024-09-24 11:33:05 -04:00
ImperialSympathizer
c172fe1838 Merge branch 'mystery-encounter-fixes' of https://github.com/ben-lear/pokerogue into mystery-encounter-fixes 2024-09-24 11:32:49 -04:00
ImperialSympathizer
1513f2a57d more ME balance changes and bug fixes 2024-09-24 11:32:22 -04:00
Lugiad
22117115c8
[Localization] ME French Typos (#4399)
* Update a-trainers-test-dialogue.json

* Update absolute-avarice-dialogue.json

* Update an-offer-you-cant-refuse-dialogue.json

* Update bug-type-superfan-dialogue.json

* Update clowning-around-dialogue.json

* Update dark-deal-dialogue.json

* Update field-trip-dialogue.json

* Update fiery-fallout-dialogue.json

* Update fun-and-games-dialogue.json

* Update lost-at-sea-dialogue.json

* Update mysterious-challengers-dialogue.json

* Update mysterious-chest-dialogue.json

* Update part-timer-dialogue.json

* Update slumbering-snorlax-dialogue.json

* Update the-expert-pokemon-breeder-dialogue.json

* Update the-strong-stuff-dialogue.json

* Update the-winstrate-challenge-dialogue.json

* Update training-session-dialogue.json

* Update uncommon-breed-dialogue.json

* Update weird-dream-dialogue.json

* Update berries-abound-dialogue.json
2024-09-24 10:03:11 -04:00
ImperialSympathizer
e77595ebb8
Update src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-24 09:29:40 -04:00
frutescens
8a2ffdea49 Work? 2024-09-23 23:26:29 -07:00
frutescens
7b08366a70 Changed BattlerTagImmunityAbAttr to look at lists instead 2024-09-23 23:13:07 -07:00
frutescens
bf3a2db47c Added check for ability's presence mid battle 2024-09-23 21:55:26 -07:00
frutescens
2e7bfb031b Removed random newlines 2024-09-23 20:57:52 -07:00
frutescens
1d17d7d215 some documentation 2024-09-23 20:56:43 -07:00
frutescens
15b7b525e8 please 2024-09-23 20:41:26 -07:00
frutescens
fa389912c7 Blah 2024-09-23 20:06:02 -07:00
frutescens
87b4af04be adding tests so that git doesn't auto-fail 2024-09-23 20:04:56 -07:00
frutescens
880736277a Added exceptions for Rollout and check for active ability 2024-09-23 19:28:31 -07:00