innerthunder
029d26b4c9
[Beta][P2 Bug] Fix Sappy Seed applying its secondary effect against targets with Substitute ( #4430 )
...
* Fix Sappy Seed applying Leech Seed through Substitutes
* Add docs
2024-09-25 22:32:20 -04:00
pom-eranian
0500e34f87
[Sprite][Color][Anim] Various Pokemon Sprite Fixes ( #4346 )
...
* 451 - Skorupi [Animation Fix] - @rival_kieran
- Fixed chopped up legs in Front Base, Front Shiny, Back Base and Back Shiny.
- Fixed in all animations a single choppy/weird animation loop that cut off and gave the animation itself a weird janky feeling. Removed it entirely.
- Fixed .json files accordingly. All files should be indexed, too.
* 582 Vanillite [Position Fix] - @rival_kieran
- Moves Front Base and Front Shiny to the center of the stage via adding padding to the right side of the sprite (currently the total width is 96 pixels wide, biggest allowed) and by centering the frames.
- Both should work and Vanillite doesn't have variants yet.
* 696 697 Tyrunt Tyrantrum [Colorfixes] - @ rival_kieran
- Fixed Front Shiny exp for Tyrunt (used to have the base color in 5/6 of the frames of its exp on the tailspike, it should load properly now without flicker).
- !! IMPORTANT !! Back Shiny exp for Tyrunt is currently unused because there's a worse copy of it in the /variant/exp/back folder (and I've checked and this is the one the masterlist calls for) it'd be best to revert it as the one in /variant/exp/back has extra colors due to two weird pixels + there's no real need as Tyrunt doesn't have a Base Replace
- Epic variant has been tweaked for all sprites to un-custom the eye (as it had been edited to have a slit eye instead of the ring it should have in Tyrantrum and a slightly modified ring in Tyrunt) and slightly tweak the claws (in Tyrunt, the arm claws had an extra unneeded color as border that caused issues, in Tyrantrum they weren't split properly for a change the Epic introduced). (This affects: Static Front, Static Back, Front exp, Back exp)
- Base sprites have been edited so all variants can load from shader/.json file. .json file has been put in its respective folder and should work.
- All spritesheets should be indexed and clean.
* 774 Minior ordered palettes on static sprites
* 774 minior ordered palette on exp front
* 774 Minior ordered palette exp back
* 774 Minior ordered palettes on shiny back
* 774 Minior ordered palettes on shiny exp front & back
* 774 Minior standard json for all front & back exp
all front colors have identical json values
all back colors have identical json values
* 493 Arceus fairy
* ordered palette for default silvally
palette is identical between front, back, exp front and exp back.
* standarized palettes for all silvally base images
all palettes have the same order
al images of the same type have the exact same palette
indexed rgb files
* 773-water
matched all palettes
indexed all images
* 773-bug
matched all palettes
indexed all images
* 773-psychic
matched all palettes
indexed all images
* 773-dark
matched all palettes
indexed all images
* 773-fire
matched all palettes
indexed all images
* 773-grass
matched all palettes
indexed all images
* 773-rock
matched all palettes
indexed all images
* 773-dragon
matched all palettes
indexed all images
* 773-ghost
matched all palettes
indexed all images
* 773-ground
matched all palettes
indexed all images
* 773-electric
matched all palettes
indexed all images
* 773-fairy
matched all palettes
indexed all images
* 773-flying
matched all palettes
indexed all images
* 773-poison
matched all palettes
indexed all images
* 773-steel
matched all palettes
indexed all images
* 773-ice
matched all palettes
indexed all images
* forgot 2 flying files
* 773-fighting
matched all palettes
indexed all images
* 454 Toxicroak (Base + Shiny Fix) @ vari
Adjusted base sprites to get rid of floating mouth corner.
Sprites have been saved in indexed format.
* 453 454 Croagunk Toxicroak gender variants @ vari
Recolored the new base sprites in the Variant colors. Affected sprites: All Toxicroak front sprites
added a gender difference - Rare male and epic female changed colors compared to the previous version. Affected sprites: Male rare sprites, female epic sprites.
* 4144 articuno galar json palettes
* 4146 galarian moltres palette json
* 4145 galarian zapdos palette json
* variant masterlist: set galar birds to use json palette
* [Sprite] 60 62 Poliwag Poliwrath - cleaned up stray pixels
* 280 281 282 Ralts Kirlia Gardevoir
fixed clipped horn on kirlia front and back
standard palettes
ignore mega gardevoir and gallade for now.
* 773 Silvally - created all variant palette files
* Removed variant image and anim json files
deleted "*_2" & "*_3" as they are no longer needed.
added palette file for normal-type exp front
2024-09-25 22:29:34 -04:00
Mumble
8b9dc79e20
fixed torment lapse condition ( #4440 )
...
Co-authored-by: frutescens <info@laptop>
2024-09-26 10:34:16 +09:00
innerthunder
a6a61b2984
[Move] Implement Shed Tail ( #4382 )
...
* Implement Shed Tail
* Fix leftover batonPass reference in docs
* Fix ChillyReceptionAttr
* oops
* Remove unneeded default arg in ReturnPhase
* Fix imports per Kev's suggestions
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Docs and Shed Tail on-add message
* Remove mixin attribute
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Update battler-tags.json
* Fix indents
* More nit fixes
* Make Switch[Summon]Phase params readonly
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 17:17:46 -07:00
Frederico Santos
70c6edfaed
Merge pull request #4438 from pagefaultgames/dependabot/npm_and_yarn/rollup-4.22.4
...
Dependabot/npm and yarn/rollup 4.22.4
2024-09-25 23:03:10 +01:00
Frederico Santos
05c84aaa8a
Revert "Bump rollup from 4.18.1 to 4.22.4 ( #4429 )" ( #4437 )
...
This reverts commit eab610ca22
2024-09-25 23:02:11 +01:00
Mumble
57f39efdae
[Moves][Ability] Implement Torment / Taunt / Imprison + Aroma Veil ( #4378 )
...
* Torment
* Taunt and Imprison
* ability immunities
* Aroma Veil
* Imprison
* Test Files
* Added exceptions for Rollout and check for active ability
* adding tests so that git doesn't auto-fail
* Blah
* please
* some documentation
* Removed random newlines
* Added check for ability's presence mid battle
* Changed BattlerTagImmunityAbAttr to look at lists instead
* Work?
* Imprison and Taunt Tests
* Tests
* Final tests before documentation
* documentation blah
* Imports
* Flx Change
* flx - adding overrides
* Update src/data/arena-tag.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* flx fixes
* quick docs
* privated retrieveField
* Handling undefined
* Update src/data/arena-tag.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* forget to remove partials for heal block
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* Marked Torment as partial
* Update src/test/moves/torment.test.ts
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
* tsdocs
* Prevents test pokemon from being immune to torment
* Update src/data/arena-tag.ts
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
* Torranx Fixes
* Check for this.source
* why
* lighting things with my mind on fire
* aRHGHSHDKSHD
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-09-25 14:52:48 -07:00
dependabot[bot]
eab610ca22
Bump rollup from 4.18.1 to 4.22.4 ( #4429 )
...
* Undo egg skip event
* Readded vouchers to original weights
* [Bug] Fix Dire Hit & System Data Conversion Failure (#4282 )
Co-authored-by: xsn34kzx <xsn34kzx@gmail.com>
* Bump rollup from 4.18.1 to 4.22.4
Bumps [rollup](https://github.com/rollup/rollup ) from 4.18.1 to 4.22.4.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v4.18.1...v4.22.4 )
---
updated-dependencies:
- dependency-name: rollup
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Co-authored-by: xsn34kzx <xsn34kzx@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-25 22:52:31 +01:00
NightKev
b87999e261
Merge branch 'beta' into dependabot/npm_and_yarn/rollup-4.22.4
2024-09-25 14:45:42 -07:00
dependabot[bot]
320aefd1a3
Bump rollup from 4.18.1 to 4.22.4
...
Bumps [rollup](https://github.com/rollup/rollup ) from 4.18.1 to 4.22.4.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v4.18.1...v4.22.4 )
---
updated-dependencies:
- dependency-name: rollup
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-09-25 21:33:18 +00:00
returntoice
579975dfc9
[Localization] minor ko fix ( #4433 )
...
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-09-25 15:59:37 -04:00
Enoch
acc1ef4add
fix Korean i18n param case ( #4431 )
2024-09-25 12:37:49 -07:00
Enoch
83c18af50f
[Localization] localize reward gain with hard-coded numBerries(item count) in ME. ( #4379 )
...
* localize hard-coded numBerries
* Update src/locales/zh_CN/battle.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_TW/battle.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* change 'rewardCount' to 'count' (flx's review)
* Apply suggestions from code review - count
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Revert "Apply suggestions from code review - count"
This reverts commit 3ce0805a5c
2024-09-25 20:02:38 +02:00
Snailman11
9a63a68d25
[P3] [Localization] Added Snow Worker Keys and Dialogue for En, Es, It, Fr, De, Ko, / Suppressed Female ( #4373 )
...
* Added Snow Worker Dialogue Keys and Dialogue
Includes en, fr, it, es, de, ko
-placeholders for ja, pt_br, zh_cn, and zh_tw
* Update dialogue.json
* Added \n$ in Spanish and German so the textboxes don't overflow
* Fixed "defeat" Formatting for Singles and Doubles English, and Doubles Korean, Italian, French, Japanese, and German
* Fixed Formatting for English Singles "defeat", and Japanese Doubles "defeat"
* Update src/locales/ko/dialogue.json
Turns the periods into ellipses for Korean Snow worker Doubles
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update src/locales/ko/dialogue.json
Adds a period to Korean Singles Defeat
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update dialogue.json
* Update src/locales/ko/dialogue.json
Adds a space on line 310
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update src/locales/ja/dialogue.json
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update src/locales/zh_TW/dialogue.json
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update src/locales/zh_CN/dialogue.json
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Update src/locales/pt_BR/dialogue.json
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---------
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 19:20:32 +02:00
Lugiad
906e2e3cc4
[Localization] ME translations - The sequel ( #4396 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Fixed 'pack' to 'flock'
* Apply suggestions from code review
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update fun-and-games-dialogue.json
* Update berries-abound-dialogue.json
* Update berries-abound-dialogue.json
* Update berries-abound-dialogue.json
* Update berries-abound-dialogue.json
* Update berries-abound-dialogue.json
* Translate global-trade-system-dialogue.json
* Update global-trade-system-dialogue.json
* Update global-trade-system-dialogue.json
* Update fiery-fallout-dialogue.json
* Update lost-at-sea-dialogue.json
* Update mysterious-challengers-dialogue.json
* Update lost-at-sea-dialogue.json
* Update mysterious-chest-dialogue.json
* Update part-timer-dialogue.json
* Update safari-zone-dialogue.json
* Update safari-zone-dialogue.json
* Update shady-vitamin-dealer-dialogue.json
* Update slumbering-snorlax-dialogue.json
* Update teleporting-hijinks-dialogue.json
* Update a-trainers-test-dialogue.json
* Update clowning-around-dialogue.json
* Update global-trade-system-dialogue.json
* Update safari-zone-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update a-trainers-test-dialogue.json
* Update a-trainers-test-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update delibirdy-dialogue.json
* Update global-trade-system-dialogue.json
* Update safari-zone-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update a-trainers-test-dialogue.json
* Add files via upload
* Add files via upload
* Add files via upload
* Update mystery-encounter-messages.json
* Update clowning-around-dialogue.json
* Update safari-zone-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update a-trainers-test-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update global-trade-system-dialogue.json
* Update mysterious-chest-dialogue.json
* Update safari-zone-dialogue.json
* Update teleporting-hijinks-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update training-session-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Apply suggestions from code review
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update trash-to-treasure-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update mysterious-chest-dialogue.json
* Term synchronization( 전투 -> 배틀 )
* added "Extremely"
* Reflected new scripts
* modified by new-script
* added "special" and "imporved"
* fix hard coded -> @[TOOLTIP_TITLE]{{{numEncounters}}
* added last brace
* added tooltip_title
* added tooltip_title
* modified by new script
* updated portuguese MEs
* modified by new script
* added tooltip, made description exactly
* modifed by new script
* fixed hardcorded {{costMultiplier}}
* Change titles like no problem
* Update a-trainers-test-dialogue.json
* Update absolute-avarice-dialogue.json
* Update a-trainers-test-dialogue.json
* Update trainer-names.json
* Update menu.json
* Update modifier-type.json
* Apply suggestions from @returntoice
thanks
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update clowning-around-dialogue.json
* Update a-trainers-test-dialogue.json
* Update a-trainers-test-dialogue.json
* Update absolute-avarice-dialogue.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update field-trip-dialogue.json
* Update fun-and-games-dialogue.json
* Add files via upload
* Update clowning-around-dialogue.json
---------
Co-authored-by: frutescens <info@laptop>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: sodamelon <sodamlee315@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
2024-09-25 12:28:58 -04:00
DanStevensonx
e20d41bcbb
[Localization] Spanish corrections ( #4425 )
...
* Update game-stats-ui-handler.json
* Update battle.json
* Update dialogue.json
* Update modifier-type.json
* Update a-trainers-test-dialogue.json
* Update absolute-avarice-dialogue.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update field-trip-dialogue.json
* Update fun-and-games-dialogue.json
* Update party-ui-handler.json
* Update party-ui-handler.json
* Update trainer-classes.json
* Update trainer-names.json
* Update trainer-titles.json
* Update splash-messages.json
* Update a-trainers-test-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update splash-messages.json
* Update clowning-around-dialogue.json
2024-09-25 12:28:41 -04:00
MokaStitcher
03bedac283
[P3 Bug] Fix form name not always showing in starter select ( #4406 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 10:20:33 -04: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
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
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
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
ImperialSympathizer
b2b88c37cf
fix Absolute Avarice test
2024-09-23 19:36:09 -04:00
ImperialSympathizer
ff256f78dd
can no longer go above max rev seed stacks
2024-09-23 19:29:32 -04:00
ImperialSympathizer
4d8d605c02
merge from beta
2024-09-23 19:25:13 -04:00
ImperialSympathizer
05b9e74729
balance adjustments to certain ME battles
2024-09-23 19:23:46 -04:00
flx-sta
b2b314cd68
[Refactor][Tests] Remove manual test timeouts ( #4385 )
...
* remove: manual timeout setting
some more sneaked in after changing the default-timeout to 20s. Possibly older PRs.
* remove: manual test timeouts from chilly reception tests
2024-09-23 17:35:53 -04:00
ImperialSympathizer
23f006bc43
[Enhancement] Remove unnecessary loading of trainer sprites in loading scene ( #4397 )
...
* Remove unnecessary loading of trainer sprites in loading scene
* load trainer assets on demand for run history UI
---------
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-09-23 17:34:47 -04:00
Tempoanon
eb264cffee
[Beta] Revert "[Enhancement] Set Appropriate Evil Team on Monogen Challenges ( #4355 )" ( #4395 )
...
This reverts commit 35cd615363
2024-09-23 17:34:06 -04:00
Lugiad
f32e10d549
[Localization] ME translations ( #4183 )
...
* Update src/locales/es/mystery-encounters/department-store-sale-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fight-or-flight-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fiery-fallout-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/modifier-select-ui-handler.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/field-trip-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update a-trainers-test-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update bgm-name.json
* Added Korean missingthings at bug-type-superfan-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update shady-vitamin-dealer-dialogue.json
* Update slumbering-snorlax-dialogue.json
* Update teleporting-hijinks-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update the-strong-stuff-dialogue.json
* Update the-winstrate-challenge-dialogue.json
* Update training-session-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update uncommon-breed-dialogue.json
* Update weird-dream-dialogue.json
* Update bgm-name.json
* Update src/locales/ko/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/zh_CN/mystery-encounters/mysterious-chest-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_CN/mystery-encounters/fight-or-flight-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* one more typo fix
* Update slumbering-snorlax-dialogue.json
* Update absolute-avarice-dialogue.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update the-pokemon-salesman-dialogue.json
* Update trash-to-treasure-dialogue.json
* Update uncommon-breed-dialogue.json
* Update weird-dream-dialogue.json
* Update weird-dream-dialogue.json
* Update slumbering-snorlax-dialogue.json
* translated a-trainers-test-dialogue.json
* Update src/locales/ja/modifier-select-ui-handler.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/mystery-encounter-messages.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Add files via upload
* Update the-expert-breeder-dialogue.json
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update src/locales/pt_BR/trainer-names.json
* Update src/locales/pt_BR/trainer-titles.json
* Update config.ts
* Update config.ts
* Update config.ts
* Delete src/locales/en/the-expert-breeder-dialogue.json
* Delete src/locales/ca_ES/the-expert-breeder-dialogue.json
* Delete src/locales/de/the-expert-breeder-dialogue.json
* Delete src/locales/es/the-expert-breeder-dialogue.json
* Delete src/locales/fr/the-expert-breeder-dialogue.json
* Delete src/locales/it/the-expert-breeder-dialogue.json
* Delete src/locales/ja/the-expert-breeder-dialogue.json
* Delete src/locales/ko/the-expert-breeder-dialogue.json
* Delete src/locales/pt_BR/the-expert-breeder-dialogue.json
* Delete src/locales/zh_CN/the-expert-breeder-dialogue.json
* Delete src/locales/zh_TW/the-expert-breeder-dialogue.json
* Add files via upload
* Update the-expert-breeder-dialogue.json
* Rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* updated name and conifg
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Update and rename the-expert-breeder-dialogue.json to the-expert-pokemon-breeder-dialogue.json
* Start of dialogue
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update config.ts
* Update absolute-avarice-dialogue.json
* Update absolute-avarice-dialogue.json
* Added the option to have the species name for all 3, made the name of the breeder localizable
* Revert changes that are in another pr
* She is apparently female so needs changes
* Update an-offer-you-cant-refuse-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* Update trainer-names.json
* add translation for expert breeder
* Update src/locales/ja/mystery-encounter-messages.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/trainer-names.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update dialogue.json
* translated all MEs
* Update src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_CN/trainer-names.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update achv.json
* Update src/locales/ja/trainer-names.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/de/achv.json
* Update src/locales/de/achv.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update bug-type-superfan-dialogue.json
* Update src/locales/pt_BR/achv.json
* Update translation for "breedersInSpace" in pt_BR splash-messages.json
* Update bug-type-superfan-dialogue.json
* Update src/locales/ko/achv.json
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
* Update src/locales/es/mystery-encounters/fun-and-games-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/ja/achv.json
Co-authored-by: protimita <protimitajp@gmail.com>
* Update src/locales/ko/mystery-encounter-messages.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/delibirdy-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/delibirdy-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/mystery-encounters/part-timer-dialogue.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update src/locales/ko/trainer-names.json
Co-authored-by: returntoice <dieandbecome@gmail.com>
* Update clowning-around-dialogue.json
* Update clowning-around-dialogue.json
* Update src/locales/es/mystery-encounters/global-trade-system-dialogue.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update src/locales/ja/mystery-encounters/bug-type-superfan-dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update global-trade-system-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json
* Update src/locales/ko/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
* Update src/locales/zh_CN/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update bgm-name.json
* Update battle.json
* Update an-offer-you-cant-refuse-dialogue.json
* Update berries-abound-dialogue.json
* Update the-expert-pokemon-breeder-dialogue.json in pt_BR locale
* Update bug-type-superfan-dialogue.json
* Update src/locales/es/achv.json
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
* Update bug-type-superfan-dialogue.json
* Update clowning-around-dialogue.json
* Update dancing-lessons-dialogue.json
* Update config.ts
* Update delibirdy-dialogue.json
* Update department-store-sale-dialogue.json
* Update weird-dream-dialogue.json
* Update battler-tags.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update mysterious-chest-dialogue.json
* Update weird-dream-dialogue.json
* Update uncommon-breed-dialogue.json
* Update field-trip-dialogue.json
* Update src/locales/ja/mystery-encounters/dark-deal-dialogue.json
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ko/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Update src/locales/ja/mystery-encounters/berries-abound-dialogue.json
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update mystery-encounter-messages.json
---------
Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: José Ricardo <josefleury@discente.ufg.br>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: KimJeongSun <leo@atlaslabs.ai>
Co-authored-by: protimita <protimitajp@gmail.com>
Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com>
2024-09-23 21:37:59 +02:00
PrabbyDD
3d4eadbc3e
[Bug] Flash Fire/etc now trigger even if the attack would miss ( #4337 )
...
* adding immunity check
* making tests
* modifying and adding tests
* making tests more rigorous
* changing hitcheck return to be what it was originally, no significant effect
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-09-23 15:37:21 -04:00
chaosgrimmon
4557a73ecc
[Sprite] Standardise Sirfetch'd animation ( #4393 )
...
* [Sprite] Match Sirfetch'd animation
Taken from shiny counterpart
* [Sprite] Standardise Sirfetch'd animation
Colours taken from static sprite.
Spritesheet animation taken from shiny counterpart.
* [Sprite] Standardise Sirfetch'd animation
Colours taken from static sprite.
Spritesheet animation taken from shiny counterpart.
2024-09-23 15:36:17 -04:00
flx-sta
c4f81c55b0
[Tests][Mystery-Encounter] Fix The Strong Stuff flakyness ( #4394 )
...
* extend: log in encounter phase for better debugging
* fix: `the storng stuff` test flakiness
The enemy pokemon could get contrary or other abilities that cause the expected values to be ... not as expected
* remove accidental it.each
tests were being executed 30-100 times. This is a debugging tool but was never supposed to make it to merge.
2024-09-23 15:32:07 -04:00
Lugiad
3ef692227d
[Localization] Spanish Gitlocalize leftovers ( #4390 )
...
* Update battle.json
* Update move-trigger.json
* Update trainer-classes.json
* Update trainer-titles.json
* Update battle-info.json
* Update battle.json
* Update challenges.json
* Update common.json
* Update game-stats-ui-handler.json
* Update menu-ui-handler.json
* Update pokemon-info-container.json
* Update starter-select-ui-handler.json
* Update tutorial.json
* Update move.json
* Update battle.json
2024-09-23 13:10:02 -04:00
Tempoanon
342bd5c726
[Beta][Bug] Fix out of bounds Genesect form in Ghetsis_2 causing crash ( #4389 )
2024-09-23 12:05:49 -04:00
NightKev
554d4f0a95
[P2 Bug] Dragon Tail now properly respects abilities like Suction Cups ( #4252 )
...
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-23 11:50:42 -04:00
Tempoanon
b9b69ad834
[Move] Implement autotomization weight effects ( #4228 )
...
* Implement Autotomize
* Another linting
* Fix unit tests
* Add nonnull after checking for null
* Update autotomize test
---------
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-23 11:42:17 -04:00
