Zach Day
6d6981600b
Merge branch 'fix/damp' of github.com:zacharied/pokerogue into fix/damp
2024-08-12 21:57:30 -04:00
Zach Day
c288e241e6
Add translation stubs
2024-08-12 21:47:32 -04:00
Zach Day
9827ff5cb5
Clean up comments
2024-08-12 21:46:32 -04:00
Zach Day
64aa989aaa
Add unit tests for mon with Damp using explosive move
2024-08-12 21:46:32 -04:00
Zach Day
2a4a056426
Fix explosive moves used by a mon with Damp not getting suppressed
2024-08-12 21:46:31 -04:00
Zach Day
b7853f9ee6
Update test for #1476 fix
2024-08-12 21:46:31 -04:00
Zach Day
60724a84e4
Use array as parameter for FieldPreventMovesAbAttr
2024-08-12 21:46:31 -04:00
Zach Day
2deffeb024
Don't splat args to getTriggerMessage
2024-08-12 21:46:30 -04:00
Zach Day
98f72e9324
Update move history entry to FAIL when prevented by Damp
2024-08-12 21:46:17 -04:00
Zach Day
2622500296
Remove redundant attr application
2024-08-12 21:45:23 -04:00
Zach Day
467447b59b
Localize strings
2024-08-12 21:45:04 -04:00
Zach Day
a1a795e082
Cleanup tests
2024-08-12 21:44:24 -04:00
Zach Day
bab7355a34
Remove EXPLOSIVE tag, Damp can decide which moves to suppress
2024-08-12 21:44:24 -04:00
Zach Day
97c8d33c7e
String fix
2024-08-12 21:43:54 -04:00
Zach Day
914b41aaf7
Squashed commit of the following:
...
Merge branch 'main' into damp_test
Cleanup tests
Add tests for interaction with Aftermath
Prevent ability popup when suppressing Aftermath damage
Adds test for damp visual functionality
Fix missing import
Prevent explosion effect and animation with Damp
Split the PostFaintContactDamage portion of Damp into its own AbAttr
Standardize Damp effect via MoveAttr
2024-08-12 21:43:54 -04:00
damocleas
6d515d58b5
[Balance] Egg and Starter Adjustments (increase HA chance, decrease candy costs) ( #3419 )
...
* [Balance] Egg Adjustments
* Reduced Cost of Same-Species Eggs
* Update egg.ts
* check errors
* Candy per Species-Egg Adjusted
* Set egg cost back to 10 for 9/10 cost mons
* 8-10 Legendaries made to 8 cost Eggs
* Updated some Passive Costs and Cost Reductions
* Change HA rate of eggs to 192
Also clean up the if to make it more readable
* Changed HA Rate from Same-Species Eggs up 1/4 -> 1/8
* Rename "voucher*" variables to "gacha*"
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-12 16:27:33 -04:00
Lugiad
9669735d4c
[Localization(it)] Update filter-bar.ts ( #3517 )
2024-08-12 13:58:25 -04:00
Mumble
897f0279ec
[BUG] Pokemon with the Levitate ability - Sand Attack Interaction Fix ( #3442 )
...
* Included a check for move category in TypeImmunityAbAttr
* Failure 1
* Created new attribute for Levitate - blame Game Freak
* renamed abattr to more descriptive attacktypeimmunityabattr
* need caffeine
* the documentation
---------
Co-authored-by: Frutescens <info@laptop>
2024-08-12 17:19:58 +01:00
Lugiad
c32f195fe0
[Localization] French corrections/translations/adjustments tour ( #3516 )
...
* Update battler-tags.ts
* Update settings.ts
* Update filter-bar.ts
* Update modifier-type.ts
* Update achv.ts
* Update modifier-type.ts
* Update achv.ts
* Update starter-select-ui-handler.ts
* Update challenges.ts
* Update bgm-name.ts
* Update achv.ts
* Update bgm-name.ts
2024-08-12 11:44:05 -04:00
Lugiad
6a6b333fa1
[Localization(fr)] Update filter-bar.ts ( #3515 )
2024-08-12 10:21:43 -04:00
Kevin
f1dfaff606
[Typo] Swaps bug report field names ( #3507 )
2024-08-12 10:18:40 -04:00
Chapybara-jp
55174f14aa
[Localisation(ja)] arena-tag.ts ( #3510 )
...
Technical issues made it so that my suggestions weren't added in the PR, added them here instead.
toxicSpikesActivateTrapPoison seems to have incorrect dialog in English as well. ( "[X] absorbed [Y]!" )
2024-08-12 10:10:18 -04:00
Lugiad
377b422cd1
[Localization] - Missing translations to the Filter bar in some languages ( #3457 )
...
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update filter-bar.ts
* Update filter-bar.ts
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update filter-bar.ts
* Update src/locales/ja/filter-bar.ts
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update filter-bar.ts
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* Update filter-bar.ts
* [Localization][JA]Update filter-bar.ts
Added hyphens for constancy.
Added 4 new translations.
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update filter-bar.ts
* Update filter-bar.ts
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/filter-bar.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update filter-bar.ts
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/de/filter-bar.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update filter-bar.ts
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/pt_BR/filter-bar.ts
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_CN/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/filter-bar.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
---------
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
2024-08-12 10:08:23 -04:00
José Ricardo Fleury Oliveira
4a095af411
[Localization] Updated Portuguese translations ( #3511 )
...
* berry
* favorites
* more updates
2024-08-12 10:07:51 -04:00
José Ricardo Fleury Oliveira
5505a4d1f0
[Localization] Updated and localized "The stack for this item is full." message ( #3491 )
...
* [Localization] Localized "The stack for this item is full." message
* Update src/locales/es/battle.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/battle.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/de/battle.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/fr/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/zh_CN/battle.ts
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
* Update src/battle-scene.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* Update src/locales/zh_TW/battle.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/ko/battle.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
* remake
* Update src/locales/fr/battle.ts
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
* Update src/locales/de/battle.ts
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
* Update src/locales/es/battle.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/es/battle.ts
Co-authored-by: Asdar <asdargmng@gmail.com>
* Update src/locales/ja/battle.ts
Co-authored-by: protimita <protimitajp@gmail.com>
* Update Korean translation for battle.ts
* Update src/locales/zh_CN/battle.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_TW/battle.ts
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
* Update src/locales/zh_CN/battle.ts
* trailing space
---------
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
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: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
2024-08-12 10:07:41 -04:00
Leo Kim
5020d742f7
[Bug] Fixed bug where container for unfiltered Pokémon does not try to setVisible ( #3509 )
2024-08-12 09:25:24 -04:00
Amani H.
a35aff7b25
[Refactor/Bug] Overhaul & Document Item/Modifier Overrides ( #2320 )
...
* Overhaul & Document Item/Modifier Overrides
* add reverse lookup for modifier tier in modifier overrides
* Refactor `withTierFromPool`
* Minor NIT
* Another NIT
* Fix `strict null` issue
---------
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-08-12 11:54:52 +01:00
NightKev
223295e827
[Fix] Refactor Disguise to work like Ice Face ( #2684 )
...
* Fix typos in `src/data/egg.ts` comments
* Refactor Disguise using Ice Face as a base
i18n {
Co-authored-by: Arxxer <javiptn7@gmail.com>
Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
}
Update tests
* Update jsdoc
* Make recoil damage a parameter
* Fix Ice Face i18n parameter name
* Add i18n placeholder strings for translation
* Update disguise test with override helper functions
* Move a form change from `battle-scene.ts` to `ability.ts`
* Remove a bit of obsolete code from the Disguise test
* Add some translations
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Sonny Ding <93831983+sonnyding1@users.noreply.github.com>
* Add translation placeholder strings for Japanese and Catalan
* Update for strict-null
* Remove unused parameter from the `BattlerTag` class
* Remove species checks, fusion doesn't seem to be an issue (any more?)
* Move Ice Face weather-based code to a subclass
* Condense conditionals
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
---------
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Sonny Ding <93831983+sonnyding1@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-08-12 11:52:39 +01:00
Leo Kim
d3d376dca3
[Enhancement] update initial filter setting when not in challenge mode ( #3506 )
...
* update initial filter setting when not in challenge mode
* Modify the code with more consideration for future scalability.
* update initial setting in challenge mode also. no conditional setting!
2024-08-12 02:19:20 -04:00
Amani H.
d2c6aa5df8
[Bug] Prevent Relearnable Egg Moves in Fresh Start ( #3466 )
...
* [Bug] Prevent Relearnable Egg Moves in Fresh Start
* Mention Condition in Docs
* Use `isFreshStartChallenge()`
2024-08-12 01:49:32 -04:00
Tempoanon
63b5195b14
[Bug] Some fresh start fixes ( #3420 )
...
* Fix some fresh start bugs
* Forgot a !
* Add fresh start check on eviolite too
* Remove part about cost being 3
* Update src/game-mode.ts
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* Rename isFreshStart helper function
---------
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-12 01:34:53 -04:00
allen925
c078e5d612
[Bug][Test] Fix minor bug of ability Flash Fire, added test file ( #3458 )
...
* fix: let flash fire hit after frozen, and baton pass not passing it. added: flash fire test file
* added more tests and made small adjustments
* Update src/test/abilities/flash_fire.test.ts
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
---------
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-08-12 01:26:37 -04:00
DustinLin
ec26e751f8
[TEST] - adding parting shot move test ( #3412 )
...
* adding parting shot test
* improve tests
* updating test
* fixing existing tests
* more tests
* adding more tests
2024-08-12 01:13:56 -04:00
Enoch
0c64b01f3f
[Refactor] move and change localization key of battler-tags ( #3498 )
...
* move locale messages of battler tags : battle.ts -> battler-tags.ts
* Change message key name to simple
* Apply suggestions from code review
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---------
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2024-08-12 01:02:44 -04:00
Chapybara-jp
0028ae8a6d
[Localization(ja)] Translate starter-select-ui-handler.ts ( #3481 )
...
* [JA] [Localization] Translate starter-select-ui-handler.ts
Unsure about "Enable/Disbale Passive", need some advice.
* Update starter-select-ui-handler.ts
2024-08-12 01:02:06 -04:00
protimita
097d43feaf
[Localization(ja)] Translated modifier.ts, arena-tag.ts ( #3487 )
...
* [Localization][JA] translated modifier.ts
translation for modifier.ts
* Update src/locales/ja/modifier.ts
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* Update src/locales/ja/modifier.ts
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
* [Localization][JA] Translated arena-tag.ts
Translation for arena-tag.ts
---------
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
2024-08-12 01:00:54 -04:00
Chapybara-jp
d19caf6650
[Localisation(ja)] Translated save-slot-select-ui-handler.ts ( #3475 )
...
* Translated save-slot-select-ui-handler.ts
"Wave" needs special coding to look correct.
* Update save-slot-select-ui-handler.ts
missed a space, punctuation
* Update save-slot-select-ui-handler.ts
* Update save-slot-select-ui-handler.ts
2024-08-12 00:57:47 -04:00
AJ Fontaine
77a9a2306b
[Item] Skip Ability Charm reward after wave 189 in classic ( #3477 )
2024-08-12 00:57:19 -04:00
Adrian T.
4b16b64eed
[Test] move util func to gameManager.ts ( #3494 )
2024-08-12 00:56:31 -04:00
NightKev
0e0ed10ce0
[Test] Fix test names that weren't changed from copy/pasting ( #3502 )
2024-08-12 00:54:42 -04:00
Leo Kim
53e54df9ee
[Enhancement] Add Passive / Cost Reduction - Can Unlock option and Egg purchasable filter ( #3478 )
...
* add unlockable state in passive/cost reduction filter. add egg purchasable filter
* update placeholders
* update option order of UNLOCKABLE between ON and EXCLUDE
* remove egg restriction when buying eggs
2024-08-12 00:44:15 -04:00
MokaStitcher
f8b9397d06
[UI] add open filter button for mobile touch pad ( #3480 )
2024-08-12 00:44:00 -04:00
Leo Kim
0f09893091
Immediately update the passive background upon unlocking ( #3479 )
2024-08-12 03:03:20 +01:00
ImperialSympathizer
988ec664e9
Disable endless boss passives ( #3451 )
...
* fix strict null broken
* disable endless boss passives
* jsdocs on mock objects and move helper function to gameManager.ts
* Apply suggestions from flx's review
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
* fix broken test
* fix lint
---------
Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-08-11 19:40:47 +01:00
Chapybara-jp
b20314b45f
[Localization(jp)] Translate voucher.ts ( #3476 )
...
Need to be consistent with names of vouchers in modifiers.ts.
2024-08-10 12:25:25 -04:00
Tim Perdok
566cd80522
[Feature] Move touch controls configuration (Reopened) ( #3256 )
...
* [Hotfix] Fix interactions of some moves not changing types (#3183 )
* [Hotfix] Fix wild spawns not having their HA (#3190 )
* [Hotfix] Allow to hatch pokemon with Hidden Ability again (#3222 )
* chore: Update TNC links layout and position in index.html
* chore: Update TNC links font size in index.css (#3230 )
* Move Touch Controls
* ConfigToolbar alignment
* Insert config toolbar on open, camel-case classes, hidden setting
* Better toolbar styling, fixed double configToolbar bug
* Fixed typedocs
---------
Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
2024-08-10 14:17:04 +01:00
DustinLin
638a0a66b5
[Bug] removing destroy() calls on enemy pokemon after BattleEndPhase and breaks endless %50 waves ( #3461 )
2024-08-10 01:27:22 -04:00
NightKev
e820163505
[Misc] Update Pull Request template ( #3467 )
2024-08-09 16:58:15 -04:00
Blitzy
d127773a89
[Balance] Change Some Mainline Starter's Early Learnset ( #3445 )
...
* Update pokemon-level-moves.ts
* Change Poipole's Early Move
* Add notes
2024-08-09 18:48:10 +01:00
flx-sta
762feea332
[Bug][Localhost] fix Json parse issue when trying to load battle-anim ( #3455 )
...
* add content-type check for loading battle-anims
* add missing `headers` to response mocks
2024-08-09 11:17:34 -04:00