Commit Graph

3168 Commits

Author SHA1 Message Date
Yiling Kang 256670e3b4 Resolve merge conflicts 2024-07-03 23:19:14 -07:00
chaosgrimmon 38ed57f063
[Sprite] Shiny Spritzee colour correction (#2781)
* [Sprite] Exp shiny Spritzee

* [Sprite] Exp non-shiny Spritzee
2024-07-04 01:24:29 -04:00
mercurius-00 dac3f76979
[Localization] fix line break for zh-cn moves (#2786) 2024-07-04 01:22:17 -04:00
Xavion3 49e5ad764c
Let eternatus keep stat changes when changing form (#2728) 2024-07-03 23:28:02 -05:00
José Ricardo Fleury Oliveira a6091de5df
Update translation for "Lax" to "Frouxa" (#2784) 2024-07-03 22:53:14 -05:00
Xavion3 f4a1c83a7d
Fix several incorrect movesets (#2776) 2024-07-03 22:37:23 +02:00
Frederico Santos e42c329adf
[Beta] Add deployment workflow for beta environment (#2595)
* feat: Add deployment workflow for beta environment

This commit adds a new GitHub Actions workflow file, deploy-beta.yml, which is responsible for deploying the application to the beta environment. The workflow is triggered on push and pull request events. It checks if the repository is 'pagefaultgames/pokerogue' before running the deployment steps. The deployment includes checking out the code, setting up the Node.js environment, installing dependencies, building the application, setting up SSH for secure communication, deploying the build on the server using rsync, and purging the Cloudflare cache. The deployment is only performed when the push event is triggered on the default branch.
It also changes the deploy.yml workflow to be triggered only when a release is generated.

* feat: Update deployment workflow for beta environment

* Update deploy-beta name

* chore: Update deploy-beta.yml to use 'f-fsantos:beta-environment' as the ref name

* chore: Update deploy-beta.yml to use 'f-fsantos:beta-environment' as the ref name

* chore: Update deploy-beta.yml to use '2595/merge' as the ref name

* chore: Update deploy-beta.yml to include event name in deployment message

* chore: Update deploy-beta.yml to use 'pull_request' event and '2595/merge' as the ref name

* chore: Update deploy-beta.yml to include SSH public key

* chore: Update deploy-beta.yml to include SSH public key

---------

Co-authored-by: Temps Ray <temps.ray@gmail.com>
2024-07-03 16:01:32 -04:00
AJ Fontaine 34058a57ed
Don't apply Classic bonus to friendship decreases (#2552) 2024-07-03 14:36:00 -05:00
Xavion3 ef5a29f9b2
Implement support for relearner only moves (#1667)
Currently only used by Zangoose
2024-07-03 21:13:25 +02:00
innerthunder 126174efe4
[Bug] Fix Grip Claw sometimes stealing from the wrong enemy (#2766)
* Fix Grip Claw stealing from the wrong enemy

* Document held item transfer modifiers
2024-07-03 14:48:41 -04:00
Adrian T dad065cbae
[Ability] Fully Implement Steely Spirit (#2749)
* implement steely spirit

* add unit test

* cleanup

* cleanup and add another test
2024-07-03 12:55:39 -04:00
innerthunder 4c4e2bc792
[Bug] Fix evasion multiplier in hit check (#2765)
* Fix evasion multiplier in hit check

* Make Sand Veil test more future-proof
2024-07-03 12:49:12 -04:00
chaosgrimmon 63599ef52e
[Sprite] Female Scyther missing variant palettes (#2770)
* [Sprite] Missing female Scyther front variant palettes

Taken from existing male counterpart.

* [Sprite] Missing female Scyther back variant palettes

Taken from existing male counterpart.

* [Sprite] Adding female Scyther variants
2024-07-03 12:45:43 -04:00
flx-sta cc36cdb1a8
[Tests] add unit tests for accounts (#2748)
* add unit tests for accounts

* only import from vitest (not node:test)

* resolve comments

* improve test coverage for accounts.updateUserInfo

* add test coverage for account.initLoggedInUser()

* code style improvements
2024-07-02 22:00:44 -04:00
ReneGV b16bd89f17
[bug][ui] Fix eternatus candy count and display hatched egg count (#2761)
* Display eternatus eggs

* Trigger Build
2024-07-02 21:54:59 -04:00
hayuna 13b23289d1
[Bug] Fix incorrect move effectiveness (#2757)
* Fix incorrect move effectiveness

* Casting variable should be enough
2024-07-02 12:20:45 -04:00
Amani H 6da5d9d6aa
[Bug] Thief Interaction with Species Stat Boosters (#2747) 2024-07-02 10:31:28 -04:00
schmidtc1 df18dd885d
[Bug] Adjusts bug bite/pluck to remove berry pouch preservation on opponent berries (#2047)
* Adjusts bug bite functionality when stealing from opponent with three berry pouches

* Adjusts bug bite functionality when stealing from opponent with three berry pouches

* Adjusts bug bite to remove berry pouch preservation on opponent berries

* Remove Promise<Boolean> where unnecessary

Leftover code removed from previous testing of the EatBerryAttr class.

* Remove undefined check on chosenBerry

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

* Update StealEatBerryAttr if-clause readability

Decrementing inside of an if-clause removed for readability. Changed to check: if count is 1, then remove modifier.

* Localization of StealEatBerryAttr battle message

* Fixes berry incrementing after improper adjustment to readability

* Fixes berry decrementing after improper adjustment to readability

* Update battle.ts

* Update src/locales/fr/battle.ts

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

* Update battle.ts properly

Incorrectly added localization in previous commit

* Remove unnecessary space

* Update src/locales/ko/battle.ts

I do not have experience with Korean, so this may need other review.

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

* Rewrites EatBerryAttr to combine with StealEatBerryAttr

* Removes excess lines

* Revert and refactor StealEatBerry and EatBerryAttr

* Refactor for early returns instead of nesting

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
2024-07-02 10:28:38 -04:00
Enoch 0bc4f26b9d
[Localization] localized status-effect.ts and translate. (#2528)
* make postposition not to dynamic for localize

* localize status-effect.ts

* added test code, modified english postposition, modifed toxic_orb test to make it always fix in English.

* Update src/locales/zh_CN/status-effect.ts

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

* Update src/locales/fr/status-effect.ts

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

* Update src/locales/de/status-effect.ts

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

* Update src/locales/de/status-effect.ts

* added test code for check message key

* remove multi-language tests (except english)

* Update src/locales/pt_BR/status-effect.ts

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

* remove language and change test code to check method call and parameter

* Update src/locales/es/status-effect.ts

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

* Update src/locales/en/status-effect.ts

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

* Apply review suggestion

* Update src/locales/es/status-effect.ts

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

* Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

Update src/locales/es/status-effect.ts

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

* Update src/locales/es/status-effect.ts

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

* add Test with empty string parameter

* Update src/locales/es/status-effect.ts

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

* Update src/locales/fr/status-effect.ts

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

---------

Co-authored-by: 송지원 <jiwsong@gmarket.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
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: GoldTra <162721984+GoldTra@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
2024-07-02 10:22:46 -04:00
chaosgrimmon 7f8e796fae
[Sprite] Shiny Galarian Darmanitan Standard form using Unovan Zen form sprites (#2755)
* [Sprite] Correct Galarian Darmanitan front sprite

* [Sprite] Correct Galarian Darmanitan back sprite
2024-07-02 10:19:04 -04:00
José Ricardo Fleury Oliveira 302ed8c1f1
Localization (pt): Added missing translations (#2745)
* Localization (pt): Updated missing translations

* fix line break
2024-07-02 01:59:16 -05:00
Dakurei 5edc989246
Fix - EBU R 128 filter applied too strongly for some peoples (#2721)
Instead of using the recommended LUFS of -23, use the LUFS of -14 used by Youtube
    And locking in a maximum peak value of -1.0dB to avoid the saturation still present at -14 LUFS for some tracks
2024-07-01 18:22:14 -05:00
Yiling Kang ec82686305 Update to show ability even if opponent pokemon does not get statused 2024-07-01 13:31:38 -07:00
Yiling Kang aadc86dd19 Fix psycho shift interaction causing buggy behaviour 2024-07-01 13:00:33 -07:00
Jannik Tappert fd54212b76
Added missing german translation (#2742) 2024-07-01 14:47:47 -04:00
mercurius-00 db27fd6336
[Localization]Fix line break for zh-cn abilities (#2737)
* fix line break for zh-cn abilities

fix line break for zh-cn abilities

* add newline

add newline
2024-07-01 11:06:03 -04:00
chaosgrimmon 95c4ed017a
[Sprite] Swap static epic Dudunsparce back names (#2739)
* Rename 982-three-segment_3.png to 982-temp_3.png

temp change to swap non-destructively

* Rename 982_3.png to 982-three-segment_3.png

* Rename 982-temp_3.png to 982_3.png
2024-07-01 11:04:20 -04:00
Yiling Kang 7067187532 Initial changes for Synchronize ability 2024-07-01 02:29:39 -07:00
Yonmaru40 7d07755718
[Localization] various zh_cn translation fix (7-1) (#2734)
* Update ability-trigger.ts

* Update ability.ts

* Update battle.ts

* Update bgm-name.ts

* Update challenges.ts

* Update dialogue.ts

* Update modifier-type.ts

* Update modifier-type.ts

* Update move.ts

* Update move.ts

* Update pokemon-info.ts

* Update pokemon-info.ts

* Update splash-messages.ts

* Update starter-select-ui-handler.ts

* Update bgm-name.ts

* Update splash-messages.ts

* Update src/locales/zh_CN/battle.ts

级 → Lv.

* Update src/locales/zh_CN/modifier-type.ts

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

* Update src/locales/zh_CN/modifier-type.ts

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

* Update splash-messages.ts

---------

Co-authored-by: RimKnight <rimknight852@gmail.com>
2024-07-01 00:13:12 -04:00
innerthunder f4c8f0080a
[Bug] Add user Pokemon check to multi-hit early stopping (#2726) 2024-06-30 15:21:23 -04:00
Franck TROUILLEZ 53ef64f61b
Revert "Allow to auto-bump the version and show version in title (#2307)" (#2723)
This reverts commit 1583fdc4cb.
2024-06-30 13:11:01 +02:00
Franck TROUILLEZ 1583fdc4cb
Allow to auto-bump the version and show version in title (#2307) 2024-06-30 13:03:05 +02:00
innerthunder 284c3c628b
[Unittest] Remove random berry effects from PBond tests (#2715) 2024-06-29 21:48:05 -04:00
innerthunder d278df8fef
[Bug] Fix multi-hit moves persisting after sleep/freeze (#2712) 2024-06-29 17:30:10 -04:00
EmberCM 6cba5acfd0
[QoL] Remove money modifiers from last wave of classic (#2714) 2024-06-29 17:28:15 -04:00
chaosgrimmon 5e3dcc3ad9
[Sprite] One more Mimikyu Disguised form tag (#2711) 2024-06-29 17:26:42 -04:00
innerthunder a48429de09
[Bug] Fix Make It Rain applying stat change twice after KO'ing both opponents (#2696)
* Revert Make It Rain stat change behavior

* ESLint

* Add double KO unit test
2024-06-29 13:59:26 -04:00
NightKev b82c85899e
[Unittest] Add tests for Tidy Up (#2667) 2024-06-29 13:56:38 -04:00
chaosgrimmon bc94858c40
[Sprite] Fixes Busted Mimikyu variants and icons; Fixes #2683 (#2690)
* [Sprite] Gives Disguised form explicit identifier

`null` defaults to `disguised`, as is desired.

* [Sprite] Renamed Disguised form has exp sprites

* [Sprite] Add Busted Mimikyu to masterlist

* Rename static non-shiny front 778.png to 778-disguised.png

* static non-shiny front

* exp non-shiny front

* static non-shiny back

* exp non-shiny front

* static non-shiny back

* static shiny front

* static shiny front

* non-shiny icon

* exp non-shiny back

* shiny icon

* static var front

* exp non-shiny back

* exp shiny front

* exp shiny front

* exp shiny back

* static shiny back

* exp var front

* static var back

* Delete public/images/pokemon/variant/exp/778_3.png

* Delete public/images/pokemon/variant/exp/778_3.json

* exp shiny back

* exp shiny back

* rare icon

* epic icon

* exp var back

* static var front BUSTED

* static var back BUSTED

* exp var front BUSTED

* exp var back BUSTED

* [Sprite] Static Mimikyu Busted sprite fix

Fixes eyeholes on torso

* [Sprite] Exp Mimikyu sprite fixes

Fixes eyeholes on torsos

* Trim static shiny front sprite size

Addresses issue #2683

* [Sprite] Match static shiny Disguised w non-shiny

Addresses issue #2683
2024-06-29 13:54:02 -04:00
ReneGV 2dd8aaf31a
[miscellaneous] Create single variable for max pokeballs (#2698)
* Configure max pokeballs

* Rename variable
2024-06-29 13:52:30 -04:00
ReneGV fd586ecd8e
[Bug] Fix purify (#2697) 2024-06-28 20:59:06 -04:00
Dakurei 6865b6b846
Application of EBU R 128 to all BGM (#2691)
+ Avoids disparities between tunes, and tunes that were too loud and tended to saturate
2024-06-28 16:06:50 -05:00
Madmadness65 15671a6922
Add new custom biome music by Firel (#2681) 2024-06-28 11:26:06 -05:00
NightKev 924ee17f70
[Unittest] Fix mocked value in Volt Absorb test (#2685) 2024-06-28 12:13:25 -04:00
AJ Fontaine 96f72eae2f
[QoL] Don't offer ball rewards when you have max in Classic mode (#1677)
* Don't offer ball rewards past floor 189

* Remove balls from reward pool when you have max

* Change only applies to classic

* Function to weigh the player's balls

* Documented hasMaxBalls function

* More specific comment
2024-06-28 12:11:52 -04:00
José Ricardo Fleury Oliveira cd73c37d4b
[Localization(pt)] Fixed translation inconsistencies for critical hit messages (#2676) 2024-06-28 10:33:06 -04:00
chaosgrimmon 51a107f1cf
[Sprite] Implement female Pyroar icon (#2682) 2024-06-28 10:15:04 -04:00
Madmadness65 d4856c34f1 Fix minor BGM title typos
"Marowak Dojo" was missing the "k" in their names.
2024-06-27 23:56:41 -05:00
NightKev 784035b6f5
[Unittest] Prevent berries from interfering with Dry Skin tests (#2679) 2024-06-28 00:55:09 -04:00
flx-sta d5b1459422
[Docs] add some inline docs for boss segments logic (#2678) 2024-06-27 23:20:42 -04:00