Commit Graph

3317 Commits

Author SHA1 Message Date
chaosgrimmon
6735dd7241
[Sprite] Mega Mewtwo sprite fixes (#3065)
* [Sprite] Add static epic Mega Mewtwo Y

Colours taken from exp, as consistent/exp rare backs share palettes.

* [Sprite] Fix transparent pixels on Mega Mewtwo X

* [Sprite] Fix transparent pixels on Mega Mewtwo X

* [Sprite] Add static epic Mega Mewtwo Y

Now exists, and is a paletteswap
2024-07-19 00:50:42 -04:00
chaosgrimmon
36cf0eacd0
[Sprite] Remove extra Oinkologne sprites (#3067)
* Delete public/images/pokemon/female/916.png

* Delete public/images/pokemon/exp/female/916.json

* Delete public/images/pokemon/exp/female/916.png

* Delete public/images/pokemon/female/916.json
2024-07-19 00:50:25 -04:00
DustinLin
37526c8356
[BUG] Uturn faint switch bug fix (#2980)
* reordering adding switch phases for u-turn

* reverting some temp changes

* generalizing function

* adding PR suggestions

* nit indenting
2024-07-19 00:03:57 +01:00
송영진
eb4604db26
[Bug] implemented multi target damage penalty (#2329)
* fix: damage multiplier by  the number of targets

* fix: used actual number value rather than the number holder

* test: added unit test for counting targets

* multi-target: fixed names of the unit tests.

* test: simple-test changes

* test: changed multi-target test code

* test: testing damage decreasement

* test: multi-target test fix

* resolved conflicts in test

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
2024-07-18 16:49:00 -04:00
Dakurei
719764e2a4
[Music/BGM] New music added for the "Slum" biome, composed by Andr06 (#3000)
* Replacement of the BGM in the slum biome (by Andr06)

* Modification of BGM credits in README.md

* Replacement of the BGM name by the title chosen by its composer in all languages

* Update BGM loop point for biome 'SLUM'
2024-07-18 16:41:13 -04:00
Amani H.
99f4a9dd25
[Item] Add Scope Lens and Leek (#2666)
* [Item] Add Scope Lens and Leek

* Add Entry to pt_BR

* Localize for pt_BR

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Fix & Clean Unit Tests

---------

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
2024-07-18 10:20:55 -04:00
flx-sta
dd693ae2d3
stop loading pride-update banner (#3057) 2024-07-17 19:20:59 -05:00
Dakurei
27b03aface
[Music/BGM] Fix bgm file & loop for battle_rival (#3053) 2024-07-17 16:32:38 -04:00
José Ricardo Fleury Oliveira
c4e146b24b
[Beta][Localization] Update Portuguese battler-tags.ts and battle.ts (#3050) 2024-07-17 12:30:12 -04:00
Dakurei
bde9b84cac
Fix FR typo (#3051) 2024-07-17 11:06:51 +01:00
AJ Fontaine
4353ccc008
[Sprite] Fix Cofagrigus sprite (#3045)
* Fix Cofagrigus sprite

* Base sprite fix

* Created json variant file... manually
2024-07-17 00:19:01 -04:00
cam
fcbe5e9d76
[Bug][Fix][Surf][Muddy Water][Sludge Wave][Animation] Added image to move animations. (#3044)
* Update muddy-water.json

* Update sludge-wave.json

* Update surf.json
2024-07-16 22:17:30 -04:00
mcmontag
514c6a196c
[Bug] Fix level 100 moves being skipped if leveled past 100 (#3040) 2024-07-16 22:16:57 -04:00
chaosgrimmon
d96b553dc2
[Sprite] Revert Larvesta, fixing stray pixels (#3042)
* [Sprite] Remove normal Larvesta stray pixels

Taken from original commit

* [Sprite] Revert shiny Larvesta stray pixels

Taken from original commit

* [Sprite] Match variant Larvesta colours
2024-07-16 22:12:15 -04:00
Niccolò
e6639eca04
Update egg.ts (italian) (#3038) 2024-07-16 13:21:08 -04:00
Enoch
7d0437de6a
[Localization] Localize ability messages in ability.ts (trigger, apply...) (#2972)
* localize ability messages

* Update src/locales/de/ability-trigger.ts

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

* Modify parameter name, fix eslint

* Korean Translation, modify some wrong param

* Add missed message

* Update src/locales/de/ability-trigger.ts

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

* Update ability-trigger.ts (Partial) (Italian)

* Localize type name

* Localize type name > Libero, Protean

* param bug fix

* Update src/data/ability.ts

* Update zh-cn

* Update ability-trigger.ts (Partial part 2, still not completed) (Italian)

* Update src/locales/fr/ability-trigger.ts

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

* Update src/locales/pt_BR/ability-trigger.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/fr/ability-trigger.ts

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

---------

Co-authored-by: 송지원 <jiwsong@gmarket.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
2024-07-16 10:19:49 +01:00
Madmadness65
66481c0283 Add missing passive background graphic for legacy UI
Relating to #2497 , this adds an identical graphic to the legacy UI files, as it will show up as a missing texture otherwise.
2024-07-15 20:07:33 -05:00
schmidtc1
4261ab37ab
[BUG] Fixes bug with Metronome freezing the game (#2819)
* Tests MovePhase with new PokemonMove instead of moveset search

* Accounts for metronome call on charging moves

* Update comment in ChargeAttr to be clearer
2024-07-15 13:13:04 -04:00
schmidtc1
b215de1628
[Move] Implements Conversion 2 (#2943)
* Creates function to get type resistances, implements conversion 2

* Removes unimplemented tag, adds condition for move history to exist

* Cleans up type selection, creates i18n entries for typeChanged

* Uses typeChanged i18n in Conversion move

* More detailed docs, early return with stellar/unknown type

* Adds note that it wont track type-changing moves properly

* Rephrases doc description, adds partial since it can't track type-changing moves

* Updates localization, removes typeChanged entry to use move-trigger entry

* Missed locale de entry in last commit

* Adds comment for reason of .partial()

* Fixes localization error due to revert, removes improper merge conflict from prior commit
2024-07-15 13:12:35 -04:00
NightKev
21f2e6981c
[Bug] Remove redundant damage number popups (#3024)
* Remove magic number from Belly Drum's attr

* Remove redundant damage number popup

* Fix merge issue and remove another duplicate damage number instance
2024-07-15 01:51:26 -04:00
Jannik Tappert
4bf5031304
[Localization] Brought german localization up to date (#3010)
* Fixed errors in the german localization

* Fresh Start Challenge

* Update src/locales/de/move-trigger.ts

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

* Apply suggestions from code review

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-15 01:44:19 -04:00
Corrade
b1e7ae43a1
[Bug] Prevent fixed-damage and OHKO moves from being modified by damage-reducing abilities (#2703)
* ReceivedMoveDamageMultiplierAbAttr patch: WIP refactored damage calculation, reordered ReceivedMoveDamageMultiplierAbAttr to avoid issues with fixed damage and OHKO moves, stubbed unit tests for dragon rage (fixed damage) and fissure (OHKO)

* ReceivedMoveDamageMultiplierAbAttr patch: commented concerns regarding EnemyDamageBooster/ReducerModifier for others' reference in WIP branch

* ReceivedMoveDamageMultiplierAbAttr patch: reordered ReceivedMoveDamageMultiplierAbAttr and EnemyDamageBooster/ReducerModifier to not trigger for fixed damage and OHKO moves, completed relevant tests for dragon rage and fissure

* ReceivedMoveDamageMultiplierAbAttr patch: removed newline

* ReceivedMoveDamageMultiplierAbAttr patch: in the unit test, extracted hard-coded Dragon Rage damage to a variable

* ReceivedMoveDamageMultiplierAbAttr patch: naming consistency

* ReceivedMoveDamageMultiplierAbAttr patch: replaced awaiting DamagePhase with TurnEndPhase as the former assumes damage will be done

* ReceivedMoveDamageMultiplierAbAttr patch: removed redundant overrides in Fissure tests

* ReceivedMoveDamageMultiplierAbAttr patch: tests: refactored crit removal, removed berries, fixed bug associated with Porygon sometimes getting Trace and copying the opponent's ability, which would override the manual ability override

* Fixed unit tests

* Added a comment and cleaned up an existing one
2024-07-14 19:16:15 -04:00
sodam
a9a071bb4d
[Localization(ko)] Fixed typo in Bertha's dialogue (#3025) 2024-07-14 15:23:04 -04:00
Jannik Tappert
76b42c4f46
Revert "[Localization]Localized move-trigger text (#2913)" (#3026)
This reverts commit 39bdfea0c8.
2024-07-14 16:24:37 +01:00
Enoch
2efde67d3d
[Localization(ko)] Change line-break position of ghost type curse add message (#3022) 2024-07-14 00:56:59 -04:00
Zoruu
984b1883fc
[Bug] Fix to epic shiny Yungoos icon (#2991) (#3016)
Fixed a floating pixel in epic shiny Yungoos' icon. Caused by Mimikyu's epic shiny sprite being placed too high on the sprite sheet. Moved Mimikyu's sprite down and updated json to reflect the change.
2024-07-14 00:39:01 -04:00
EmberCM
416079da88
[QoL] Offset the status indicator to keep pokeball in view (#2966)
* Offset the status indicator to keep pokeball in view

* Only use offsetX when the Pokemon is the enemy

* Adjust position to accomodate boss health bar
2024-07-14 00:37:07 -04:00
Adrian T
8d5bfa51e8
[Enhancement] Decouple move power calculation from Pokemon.apply(), Fixes Power Spot & Battery not boosting ally's move (#2984)
* refactor power calc, fix battery & power spot

* fix hard press unit test

* fix hard press

* refactor tests

* use sypOn hp instead

* rename method

* cleanup tests

* improve tests

* use slow vs fast pokemon

* fix steely spirit test

* fix steely spirit for real this time

* remove unnecessary test

* address pr feedback

* add removed code
2024-07-14 00:28:39 -04:00
Mumble
eedabbf17c
[Bug] Struggle Recoil should ignore Magic Guard (#3017)
* Drafted testable conditions for Magic Guard

* Weather Test

* Update src/test/abilities/magic_guard.test.ts

InnerThunder

Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>

* Implemented checks for poison/toxic/burn

* Added tests for recoil moves and volatile status

* Updated Rock Head, Magic Guard, and Reckless interactions with Struggle

* Removed stray file

* Fixed Typedoc errors

* Implemented innerthunder's feedback

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
2024-07-14 00:27:42 -04:00
schmidtc1
1be11d2b3a
[Bug] Fix Lock-On and Mind Reader not working on the first turn (#3001) 2024-07-14 00:26:13 -04:00
Lugiad
a4f3829710
[Beta][Localization] Update French battler-tags.ts and battle.ts (#3015)
* Update French battler-tags.ts

* Update battle.ts
2024-07-14 00:20:40 -04:00
chaosgrimmon
3e8c9d5cfb
[Sprite] Improves Corviknight Palette usage (#3020)
* [Sprite] Compress Corviknight exp

* [Sprite] Compress Corviknight exp

* [Sprite] Compress Corviknight exp

* [Sprite] Compress Corviknight exp

* [Sprite] Compress Corviknight exp
2024-07-14 00:12:51 -04:00
Dakurei
35bbbcb484
Adds a check to the bgm-bar display to prevent it from being displayed in case of an empty value (#3007) 2024-07-13 19:31:49 +01:00
Enoch
5852cae36b
[Localization] Localize Berry Heal message (#2996)
* Localize berry heal message (HP/PP)

* Change location of translation

* conflict resolve

* Update src/locales/de/battle.ts

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

Update src/locales/de/battle.ts

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

Update src/locales/de/battle.ts

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

* 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/fr/battle.ts

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

* Update src/locales/pt_BR/battle.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/battle.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update battle.ts (Berries ITALIAN)

---------

Co-authored-by: 송지원 <jiwsong@gmarket.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-07-13 19:31:36 +01:00
Dmitriy K
2eb317c909
Fix item reward overrides going out of bounds (#3012) 2024-07-13 19:31:14 +01:00
Arxalc
4a399465d2
[Bug] Fix Clear terrains upon Trainer Battle (#2027)
* Clear terrains upon Trainer Battle

* Adjusted comment
2024-07-13 19:09:33 +01:00
Arxalc
0c0de4103b
[Bug] Making FormChangeItems Untransferrable (#2695)
* Made FormChangeItems untransferrable. Replaced getTransferrable()

* Made isTransferrable readonly. Removed unnecessary 'm as PokemonHeldItemModifier'.
2024-07-13 19:09:01 +01:00
schmidtc1
cbc6005c57
[BUG] Fixes Sketch copying the first move used by the opponent instead of the last (#2759)
* Changes getMoveHistory to getLastXMoves to fix sketch copying first move used instead of last

* Optimizes move search and early return

* Reverts check for virtual moves
2024-07-13 19:07:28 +01:00
mcmontag
f7b53faae3
[Bug] Fix import of overrides in a test (#3009) 2024-07-13 17:07:25 +01:00
mcmontag
0aa5e0d49d
[Feature] Fully implement Octolock (#2985)
* implement octolock

* Add tests
2024-07-13 03:19:53 +01:00
Enoch
985c24e7bd
[Localization] Localize missed things in battlers-tag.ts (#3004)
* Localize missed things in battlers-tag

* Change orders of configs

* Add missed phase

* Update src/locales/zh_CN/battle.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_CN/battle.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_TW/battle.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_TW/battle.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_TW/battler-tags.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_CN/battler-tags.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

---------

Co-authored-by: RimKnight <rimknight852@gmail.com>
2024-07-13 03:09:27 +01:00
AJ Fontaine
a1a906ed71
Adds bg glow behind starters with unlocked passives (#2497) 2024-07-13 02:53:54 +01:00
Frederico Santos
7709ff5d21 refactor: Update trainerId and secretId in game data
This commit updates the `trainerId` and `secretId` properties in the `GameData` class. The values are replaced with the corresponding values from the `this.trainerId` and `this.secretId` variables. This change ensures that the `trainerId` and `secretId` are correctly updated in the game data.
2024-07-13 02:43:26 +01:00
Frederico Santos
b2ced623fd Merge branch 'beta' of github.com:pagefaultgames/pokerogue into beta 2024-07-13 02:22:12 +01:00
Frederico Santos
a3177c6712 feat: Update isBeta check in utils.ts to use import.meta.env.MODE
The current implementation of the isBeta check in utils.ts is using import.meta.env.DEV, which gives the same value for both beta and dev environments. This commit updates the check to use import.meta.env.MODE === "beta" to accurately determine if the environment is beta. This ensures that the unlock all code is only accessible in the beta environment and not in production environments.
2024-07-13 02:22:02 +01:00
flx-sta
589801214b
[Bug] vite port (for development) (#3003)
* make vite-port configurable

and make it default 8000

* add retries for `does not trigger by non damage moves` test
2024-07-13 02:20:22 +01:00
Opaque02
8e44ddfde2
[Beta] Updating the manage data->unlock all option to work with all abilities, natures, forms and passives (#2967)
* Updated code to allow user to unlock all pokemon from the manage data menu option

* Added code to Utils to allow it to check for a beta env, and hid the unlock all code behind that. This should stop it from being accessed in prod envs

* Updated another section to be locked behind beta check, and also updated the everything.prsv to have everything unlocked going forward

* Fixed some code reviews
2024-07-13 01:09:27 +01:00
EmberCM
9df3bdde70
[Enhancement] Pokemon generation number tooltip (#2642)
* Create tooltip to show Pokemon generation

* Add option to toggle generation tooltip

* Use roman numeral for generation tooltip

* Revert "Add option to toggle generation tooltip"

This reverts commit 414b2366fc.

* Update src/locales/de/battle-info.ts

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

* Update src/locales/fr/battle-info.ts

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

* Update src/locales/pt_BR/battle-info.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/zh_TW/battle-info.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/zh_CN/battle-info.ts

Co-authored-by: RimKnight <rimknight852@gmail.com>

* Update src/locales/ko/battle-info.ts

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

* Update battle-info.ts (IT)

---------

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: RimKnight <rimknight852@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
2024-07-12 22:23:10 +01:00
flx-sta
4dc1af99ed
[Feature][FUN] add breedersInSpace splash message (#2631)
* add spaceBreeder splash message

* fix typo (whops)

* Add pt_BR translation

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* replace text & key with breedersInSpace

* add french tanslation

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

* remove obsolete array split in splash-messages.ts

* Update src/locales/pt_BR/splash-messages.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/es/splash-messages.ts

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

* Update splash-messages.ts (Italian)

* Update src/locales/zh_CN/splash-messages.ts

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

* Update src/locales/ko/splash-messages.ts

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

---------

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
2024-07-12 16:13:33 -05:00
Dmitriy K
2314d34907
[QoL] Create default overrides class and export that with custom overrides (#2999)
* Create default overrides class and export that with custom overrides

* add comment to mock import and replace typecast with type narrowing

* change modifier override type to pick keys from modifierTypes
2024-07-12 21:18:52 +01:00