Commit Graph

448 Commits

Author SHA1 Message Date
ImperialSympathizer
c2e5a58f59 add unit tests for offer you can't refuse encounter 2024-07-25 12:10:22 -04:00
ImperialSympathizer
792af86f39 add pokemon salesman encounter and affects pokedex UI display 2024-07-22 15:15:42 -04:00
ImperialSympathizer
186a1af7b8 nit updates and cleanup 2024-07-19 19:21:46 -04:00
ImperialSympathizer
03f999e169 finish unit tests for fiery fallout 2024-07-19 14:51:38 -04:00
ImperialSympathizer
a598c1cb05 fix unit test breaks 2024-07-18 22:56:01 -04:00
ImperialSympathizer
70fc4b67ae finish fiery fallout encounter 2024-07-18 22:37:58 -04:00
Felix Staud
3fd79984cd add fallback for biomeMysteryEncounters if empty 2024-07-17 16:06:08 -07:00
ImperialSympathizer
1a95f06795 implement max spawns per run for individual encounters, tweak spawn rates 2024-07-15 14:01:47 -04:00
ImperialSympathizer
fb9a4d3dd3 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into pokemon-salesman 2024-07-12 11:27:02 -04:00
ImperialSympathizer
4412769cd9 small bug fixes 2024-07-11 18:31:48 -04:00
Felix Staud
e8670c4f00 rename MysteryEncounter interface to IMysteryEncounter 2024-07-11 15:01:30 -07:00
Felix Staud
19d96ed381 migrate shady-vitamin-dealer encounter 2024-07-11 14:39:18 -07:00
ImperialSympathizer
f128b47db5 update encounter biome mapping and option coloring/disablement with requirements 2024-07-11 14:37:29 -04:00
ImperialSympathizer
253447136a some more small cleanup 2024-07-10 16:32:24 -04:00
ImperialSympathizer
ce55c13c12 resolve conflicts, import issues, and cleanup from rebase 2024-07-10 15:31:03 -04:00
ImperialSympathizer
7bbebb32e2 undo broken load changes 2024-07-10 15:07:18 -04:00
ImperialSympathizer
deb1e95e34 add encounter exp utility and small cleanups/refactors 2024-07-10 15:04:48 -04:00
ImperialSympathizer
f803de6b23 start adding unit tests 2024-07-10 15:03:33 -04:00
ImperialSympathizer
2318d86cb1 Mystery Encounters (#2824)
* squash commits to clean up PR

* add chest sprites

* bug fixes, cleanup, and tests

* small fixes

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-07-10 15:01:23 -04:00
ImperialSympathizer
1d0109a386 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
b3aa562bc6 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
666ec135ba bug fixes, cleanup, and tests 2024-07-10 14:52:27 -04:00
ImperialSympathizer
860e875587 rebase encounters branch with pokerogue/main 2024-07-10 14:51:06 -04:00
Madmadness65
9e1980bd8f
Allow Roaming Form Gimmighoul to be caught (#2760) 2024-07-06 11:16:08 -05:00
José Ricardo Fleury Oliveira
5ac5850082
Localization: Localize luck indicator text and shiny labels (#2644)
* feat: localize luck indicator text

* Localization: Localize luck indicator text and shiny labels

* Update src/locales/zh_CN/common.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/ko/common.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/de/common.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/es/common.ts

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Update src/locales/fr/common.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

---------

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
2024-07-04 21:34:18 -04:00
Madmadness65
67a21b8a94
[Enhancement] Add battle music for Koraidon & Miraidon (#2654)
* Add battle music for Koraidon & Miraidon

* German track title
2024-06-27 18:59:24 -05:00
Madmadness65
bbc07e22bf
Add evil team music (#2582) 2024-06-24 22:51:13 -05:00
Adrian T
71299a731c
[Bug] Eiscue changing form regardless of previous form on arena reset (#2572)
* fix eiscue (again)

* hardcode eiscue check
2024-06-24 17:05:24 -04:00
Adrian T
bc5de8810b
[Bug] fix noice crashing on arena reset (#2568) 2024-06-24 15:00:20 -04:00
Jannik Tappert
8099f02306
[Enhancement] Added a bgmBar to show the name of the track once music is played (#2457)
* Added a bgmBar to show the name of the track once music is played

* Even more close to ability bar

* It now shows. And also shows already for a couple of them a readable name

* Now the queue actually works

* Create locales for bgmName (bgm-bar ui)

  + Most of the music has only Japanese and English names
    But there are a number of tracks with official translations following OST commercialization

* Add i18n and use it to retrieve OST names (avoids a giga switch case)

  + A fallback key is implemented in the case of adding tracks not referenced in the translation files, its value being just the name of the bgm itself

* FormatText is now in Utils and not arena-flyout

BGM Names for non-localized music will be formatted to have capitalized letters and no _

* It is now a setting. It can be even changed mid fight

* Update src/ui/ability-bar.ts

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/de/bgm-name.ts

* Apply suggestions from code review

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* Added the rest of the music names

* Changed PMD EoS to PMD ETH in german (Pokemon Mystery Dungeon Erkundungsteam Himmel)

* Due to feedback it is now "PMD ET-Himmel"

* Corrected the encounter theme names (and some missed trainer class names)

* Background is now a nicneslice. And it is at the top of the screen and above everything else

* The bar now scales with the text.

* Revert override

* Update src/locales/fr/bgm-name.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* It now only appears when V is pressed (in all but starter select)

* Cleared the cod eup

* Update src/locales/zh_CN/bgm-name.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_CN/settings.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/ko/bgm-name.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* The bgmBar now appears in the pause menu instead.

* Should react better on settings change

* To be safe this required a reload now

* Update src/locales/fr/bgm-name.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/bgm-name.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Write out pokemon mystery dungeon names in german

* Update src/locales/es/bgm-name.ts

Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>

* Update src/locales/zh_CN/bgm-name.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/battle-scene.ts

---------

Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>
2024-06-24 16:31:38 +01:00
Matthew
d2f4c5b59c
[UI] UI Small Adjustments (#2525)
* UI Small Adjustments

* Fix Unit Tests

* Null check event display before clear

* better empty move placeholder debug name
2024-06-23 12:09:23 -04:00
Dakurei
eb224381a6
Fix - The wave is no longer displayed under the overlay as it used to be (even before the black overlay ...) (#2498)
+ Its previous color just made it harder to see that the text was underneath the overlay
2024-06-21 20:47:00 -04:00
Matthew Olker
7efb0ca7fe hotfix lower shop overlay 2024-06-21 19:38:59 -04:00
Jannik Tappert
cf5fa887e9
[QoL] Improve shop readibility (#2267)
* Change Rouge Text Color to green, add black shadow behind name text

* Also added shader to cost text

* Update src/ui/modifier-select-ui-handler.ts

* Changed colors that didnt fit the contrast scaling thanks to @dakurai on discord.

* Removed a useless line and added a comment

* Apply suggestions from code review

Co-authored-by: Dakurei <maxime.palanchini@gmail.com>

* Revert changes

* Change colors for better contrast score (makes reading easier)

  + Corrects colors that were totally white when they should have been f8f8f8 like the others

* Created a new overlay especially for the shop

  + This one is an almost black color with a higher opacity. This makes the shop elements easier to read, as they blend much less into the UI underneath

* Add a filter on modifiers displayed in the shop

  + Add a getModifierBar() getter to retrieve the battle-scene bar directly
  + Modified the updateModifiers() method to filter the items displayed (modifiers held by Pokémon can be hidden)
  + Shop overlay hidding transition lengthened to the same duration as its showing

* Apply suggestion from @bennybroseph

* Apply suggestion from @brain-frog

* Fix - Removal of a warning in the generation of the typedoc for which my modification is responsible

---------

Co-authored-by: Dakurei <maxime.palanchini@gmail.com>
2024-06-22 00:04:25 +01:00
Dmitriy K
74aa5a8005
Create Class constructor utility type. (#2162) 2024-06-19 12:00:26 -04:00
Matthew
d70dd16f8c
[Refactor] I18n Cleaning (#2348)
* I18n Cleaning

* pr comments

* appease typedoc

* moved types into src
2024-06-17 17:05:33 -04:00
Matthew Olker
02d5654be4 Pride Update 2024-06-14 12:42:37 -04:00
Matthew
dc30dd33b2
[QoL] Reorganize Enum Locations (#2185)
* moving enums

* import updates

* fix tsconfig paths importing (#2184)

* reverse index.ts addition

---------

Co-authored-by: Devin Korb <meepdarknessmeep@gmail.com>
2024-06-13 18:44:23 -04:00
Matthew Olker
e6c24dceab Revert "[QoL] Reorganize Enum Locations (#2142)"
This reverts commit cf06ff3b8d.
2024-06-13 11:30:47 -04:00
Matthew
cf06ff3b8d
[QoL] Reorganize Enum Locations (#2142)
* moving enums
2024-06-13 11:11:12 -04:00
hayuna
c929bbd23a
[Refactor] Move enum BattleStyle into separated file (#1906)
* Move enum BattleStyle into separated file

* Move enum BattleStyle into separated file

* Move enum BattleStyle into separated file

* Update battle-style.ts

* Replace shift into switch
2024-06-13 10:10:31 -04:00
Greenlamp2
c908153761
[Bug] Fix PostSummonPhase Logic to Support Single Pokémon Teams (#2153)
* added test for spikes + forceOpponentToSwitch

* fix conditional for intimidate in a double if there is only 1 pokemon available on our side

* fix variable naming and ternary condition

* added a fallback to clear the conditionalQueue if it's a new turn

* speed up tests by skipping LoginPhase
2024-06-13 08:42:25 -04:00
Dmitriy K
0970c2cd4e
[Refactor] Replace forceBypass with bypassFaint flag (#1839)
* replace forceBypass with bypassFaint flag

* add another path alias for src/test

* make form override work for the whole party instead of the first pokemon

* add tests for all abilities that are touched by this change

* remove unnecessary overrides from tests

* move SpeciesFormChangeTimeOfDayTrigger outside arena reset logic

* remove alll resetMock calls, rename it to test
2024-06-13 11:36:12 +02:00
DustinLin
e5d9cfd10f
[Bug] Fixing Baton Pass passing (#2058)
* skip yawn and infatuation for baton pass, and some docs along the way

* update yawn condition readability
2024-06-12 10:19:50 -04:00
prime
0c85823645
[Enhancement] Golden IVs Chart when all IVs are perfect (#2019)
* golden chart for perfect IVs

The IVs chart is now golden in case all IVs are perfect.

A few overrides have also been added to make testing easier:
- the opponents IVs can be overridden
- the color can be modded via the window.perfectIVsChartColor variable.

* added perfectIVsChartColor to window

* added changes as requested

- removed global variable
- removed chart versatility
- changed color
2024-06-12 09:56:23 -04:00
Greenlamp2
f57798fd1d
[Bug Fix] Correct PostSummonPhase Timing for Abilities and Entry Hazards (#2108)
* added test for spikes + forceOpponentToSwitch

* added conditionalQueue && pushConditionalPhase to fix entry hasard and abilities at post summon

* reduce timeout time to default
2024-06-12 00:55:16 +02:00
Adrian T
65ddd49d64
[Enhancement] Move event files to a central directory (#1918)
* Move events to a central directory

* Update modifier import

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* remove old battle-scene-events

* Move to field events

* Update battle-scene.ts

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
2024-06-10 20:19:07 -05:00
Greenlamp2
d03c75c2f9
[QoL] Improve Input Accuracy by Refactoring Button Handling (#1936)
* refactored inputs-controller for better hold button management

* refactored the touch controls file to use a class and add holding button system

* added a method to deactivate pressed key for touch on focus lost

* better lost focus management
2024-06-09 19:15:37 -04:00
Tempoanon
f6ad30b58f
[Feature] Add evil teams assets (#1577)
* Fix tinted caught icon false positive

* Remove unused import

* Rename and optimize

* Block comment

* Draft of evil team grunt pokemon pools

* Add graphics and music

* Add grunt spawn logic

* Add Giovanni

* Add team leader graphics

Giovanni and Ghetsis already have sprites, so they do not need added.

* Add teams for other evil team bosses

* Fix some typos and change hp bars to 2/2/2

* Fix sprites and add random team boss

* Add forced grunt encounter and update dialogue

* Update locales

* also lint en trainers

* More merge conflicts

* Deleted some duplicate images

* Correctly renamed the grunt files

* Forgot about team rocket

* New Magma Sprites

* Adjusted the trimming. Now they dont have as huge of a shadow bbelow them

* Fix grunt sprites

* Add real dialogue

* German Localization of the Dialogue

* Changes

* Tweak waves grunts spawn on

* Fix some typos in dialogue

* Y is canon

* Disable evil team spawns

* Fix another merge conflict

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Jannik Tappert <tappertjannik@googlemail.com>
2024-06-09 19:02:29 -04:00
Madmadness65
67a0ae49b3
Add new Gym Leader, Elite Four, and Champion music (#1971) 2024-06-08 20:51:37 -05:00