Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Localization]Localized move-trigger text #3233

Merged
merged 206 commits into from
Jul 30, 2024

Conversation

mercurius-00
Copy link
Contributor

What are the changes?

Localized move-trigger text like:

  • "was damaged by the recoil!"
  • " cut its own HP to power up its move!"
  • "took {{targetName}}\ninto the sky!"
  • "incinerated\n{{targetName}}'s {{itemName}}!"
  • ......

Why am I doing these changes?

It should be localized

What did change?

  • Extract the text from data/move.ts to locale/[language]/move-trigger.ts
  • Change some English text to match the original game.
    original changed
    " is hit with recoil!" " was damaged by the recoil!"
    "took in sunlight!" "absorbed light!"
    "dug a hole!" "burrowed its way under the ground!"
    "lowered\nits head!" "tucked in its head!"
    "is glowing!" "became cloaked in a harsh light!"
    "is charging its power!" "is absorbing power!"
    " is trying\nto take its foe down with it!" " is hoping to take its attacker down with it!"
  • Fixed type name localization

Screenshots/Videos

✅En (Fully tested)
  1. STRUGGLE
    image
  2. STEEL_BEAM
    image
  3. COVET
    image
  4. INCINERATE
    image
  5. KNOCK_OFF
    image
  6. ELECTRO_SHOT
    image
  7. FUTURE_SIGHT
    image
  8. DOOM_DESIRE
    image
  9. BELLY_DRUM
    image
  10. PSYCH_UP
    image
  11. HEART_SWAP
    image
  12. FICKLE_BEAM
    image
  13. MAGNITUDE
    image
  14. PRESENT
    image
  15. JUMP_KICK
    image
  16. LOCK_ON
    image
  17. WHIRLWIND
    image
  18. CAMOUFLAGE
    image
  19. SOAK
    image
  20. MIMIC
    image
  21. SKETCH
    image
  22. WORRY_SEED
    image
  23. ROLE_PLAY
    image
  24. DOODLE
    image
  25. ENTRAINMENT
    image
  26. SKILL_SWAP
    image
  27. TRANSFORM
    image
  28. PAY_DAY
    image
  29. DESTINY_BOND
    image
  30. POLTERGEIST
    image
  31. RAZOR_WIND
  32. FLY
    image
  33. SOLAR_BEAM
    image
  34. DIG
    image
  35. SKULL_BASH
    image
  36. SKY_ATTACK
    image
  37. HEAL_BELL
    image
  38. DIVE
    image
  39. AROMATHERAPY
    image
  40. BOUNCE
    image
  41. SHADOW_FORCE
    image
  42. SKY_DROP
    image
  43. FREEZE_SHOCK
    image
  44. ICE_BURN
    image
  45. PHANTOM_FORCE
    image
  46. GEOMANCY
    image
  47. SOLAR_BLADE
    image
  48. BURN_UP
    image
  49. BEAK_BLAST
    image
  50. METEOR_BEAM
    image
  51. DOUBLE_SHOCK
    image
  52. FORESTS_CURSE
    image
  53. TRICK_OR_TREAT
    image
⬜Es

Missing

✅It

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
image
COVET
BELLY_DRUM
image
ROLE_PLAY
image

✅Fr

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
image
COVET
image
BELLY_DRUM
image
ROLE_PLAY
image

✅De

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
1721204445581
COVET
1721204454870
BELLY_DRUM
1721204503715
ROLE_PLAY
image

✅Pt_BR

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
image
COVET
image
BELLY_DRUM
image
ROLE_PLAY
image

✅Zh-CN

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
image
COVET
image
BELLY_DRUM
image
ROLE_PLAY
image

✅Zh-TW

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
image
POLTERGEIST
image
COVET
image
BELLY_DRUM
image
ROLE_PLAY
image

✅Ko

SKY_DROP
image
KNOCK_OFF
image
TRANSFORM
image
SOAK
image
TRICK_OR_TREAT
1721195296007
POLTERGEIST
image
COVET
image
BELLY_DRUM
image
ROLE_PLAY
image

How to test the changes?

  1. set overrides.ts
    export const MOVESET_OVERRIDE: Array<Moves> = [Moves.SKY_DROP, Moves.BEAK_BLAST, Moves.MIND_BLOWN, Moves.STEEL_BEAM];
  2. run npm run start:dev
  3. enter a battle and use moves

Checklist

  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I tested the changes (manually)?
    • Are all unit tests still passing? (npm run test)
  • Are the changes visual?
    • Have I provided screenshots/videos of the changes?

f-fsantos and others added 30 commits June 19, 2024 17:31
feat: Add link to Discord in menu UI

feat: Add Discord and Google login functionality

Add container around discord and google icons

refactor: Update environment variable names for Discord and Google client IDs

feat: Add "Or use" translation for login options in multiple languages

feat: Update menu UI translations for multiple languages

Code review fixes

refactor: Update Discord and Google client IDs in environment variables
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
this also reduces output noise in tests
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
# Conflicts:
#	src/locales/pt_BR/move-trigger.ts
# Conflicts:
#	src/locales/en/config.ts
#	src/locales/pt_BR/config.ts
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: lnuvy <lnuvy.code@gmail.com>
Co-authored-by: lnuvy <lnuvy.code@gmail.com>
* Localization(pt): translated bgm-name.ts

* fix
Fontbane and others added 25 commits July 24, 2024 10:24
…ultgames#3118)

* Make on-summon abilities trigger after the switch check

* Add test
Maintains parity with Air Lock. Both of these probably need to be localized. Should fix issue 491 though
* Option to view Summary before adding new Pokemon to party

* Fixed issues described by HopsWas

* Adjusted makeRoomForConfirmUi to improve window spacing

* Fixed ESLint issue + addressed OrangeRed review

* Fixed Github pages issue

* Removed duplicate unshiftPhase

* Fixed phase order

* Don't start from beginning of catch function

* Option to view Summary before adding new Pokemon to party

* Fixed issues described by HopsWas

* Adjusted makeRoomForConfirmUi to improve window spacing

* Fixed Github pages issue

* Fixed phase order

* Quick fix

* This should fix the summaryOption feature without bugging confirm-ui-handler in other cases

* Revert "Merge remote-tracking branch 'origin/summaryOption1' into summaryOption1"

This reverts commit ea7d0ce, reversing
changes made to 4c56595.

* Added a better conditional that reflects its source and purpose

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: AJ Fontaine <fontbane@gmail.com>
…te disruption (pagefaultgames#3041)

* Adds frenzyMissFunc trigger on NO_EFFECT hit result

* Refactors FrenzyAttr to properly lapse tags each turn and remove tags on disrupt

* Makes comment on CONFUSED tag clearer

* Changes all integer usages to number in battler-tags

* Update getBattlerTag function to use number instead of integer
* Bug Fix

* Update src/system/game-stats.ts

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

* Fixing a test

* Fixed import

* Revert "Bug Fix"

This reverts commit 8348449.

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
…ames#3122)

* Bug Fix

* Update src/system/game-stats.ts

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

* Fixing a test

* Revert "Fixing a test"

This reverts commit 1bdbe2d.

* Test Re-Run

---------

Co-authored-by: Frutescens <info@laptop>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
…ch and double battles (pagefaultgames#2462)

* Adjust how counter attacks target to account for uturn/voltswitch

* Creates move flag for metal burst/comeuppance to redirect in some cases

* Remove debug printing

* Bit shifts the redirect counter flag

* Removes extraneous class from prior testing

* Remove vitest timestamp file that was accidentally added
Mystic ticket icons in the achievements just confuse players
…red in dex (pagefaultgames#2713)

* Fix reins et al being available without unlocking second mon

* Small fix

* Parentheses for safety

* Add documentation to new function
Co-authored-by: Frutescens <info@laptop>
…stats (pagefaultgames#3117)

* Fixed OHKO moves being affected by accuracy and evasion battle stats

* Added related tests for Fissure, unskipped related test for Hustle

* Tweaked fissure accuracy and evasion tests to use spyOn() for getAccuracyMultiplier() as per feedback

* Fixed accuracy test for Fissure
* [Fix][Sprite] Politoed Back Sprites

Retrieved first version from history.
Rearranged frames to make jump a little less floaty.
Set same anim length for all variations.
Json is identical for all variations.
Spritesheet frame position is identical for all variations.
Trimmed the frame of extra space
Reduced file size of spritesheets and JSON due to less unique frames needed.

* [Fix][Sprite] Politoed Back Sprites  - Reformatted JSON to texturepacker standard

Reformatted json.
* fix remove pokemon menu

* fix dropdown all is not changing bug

* fix bug when go down with no starter on start button

* fix starter corsor bug on deletion. out of screen cursor bug

* fix challenge log

* fix lint error
# Conflicts:
#	src/data/move.ts
# Conflicts:
#	package-lock.json
#	public/images/items.json
#	public/images/items.png
#	src/battle-scene.ts
#	src/battle.ts
#	src/data/ability.ts
#	src/data/arena-tag.ts
#	src/data/battle-stat.ts
#	src/data/battler-tags.ts
#	src/data/challenge.ts
#	src/data/move.ts
#	src/data/pokemon-forms.ts
#	src/data/pokemon-species.ts
#	src/data/terrain.ts
#	src/data/type.ts
#	src/field/arena.ts
#	src/field/pokemon.ts
#	src/locales/de/config.ts
#	src/locales/en/config.ts
#	src/locales/es/config.ts
#	src/locales/fr/config.ts
#	src/locales/it/config.ts
#	src/locales/ko/battle-info.ts
#	src/locales/ko/config.ts
#	src/locales/ko/modifier-type.ts
#	src/locales/pt_BR/battle.ts
#	src/locales/pt_BR/config.ts
#	src/locales/pt_BR/modifier-type.ts
#	src/locales/pt_BR/settings.ts
#	src/locales/pt_BR/starter-select-ui-handler.ts
#	src/locales/zh_CN/battle.ts
#	src/locales/zh_CN/config.ts
#	src/locales/zh_CN/menu-ui-handler.ts
#	src/locales/zh_CN/menu.ts
#	src/locales/zh_CN/modifier-type.ts
#	src/locales/zh_CN/pokemon-form.ts
#	src/locales/zh_CN/starter-select-ui-handler.ts
#	src/locales/zh_TW/config.ts
#	src/modifier/modifier-type.ts
#	src/phases.ts
#	src/system/game-data.ts
#	src/test/abilities/ability_timing.test.ts
#	src/test/abilities/aura_break.test.ts
#	src/test/abilities/battery.test.ts
#	src/test/abilities/battle_bond.test.ts
#	src/test/abilities/costar.test.ts
#	src/test/abilities/disguise.test.ts
#	src/test/abilities/dry_skin.test.ts
#	src/test/abilities/hustle.test.ts
#	src/test/abilities/ice_face.test.ts
#	src/test/abilities/intimidate.test.ts
#	src/test/abilities/intrepid_sword.test.ts
#	src/test/abilities/libero.test.ts
#	src/test/abilities/moxie.test.ts
#	src/test/abilities/parental_bond.test.ts
#	src/test/abilities/power_construct.test.ts
#	src/test/abilities/power_spot.test.ts
#	src/test/abilities/protean.test.ts
#	src/test/abilities/quick_draw.test.ts
#	src/test/abilities/sand_veil.test.ts
#	src/test/abilities/sap_sipper.test.ts
#	src/test/abilities/schooling.test.ts
#	src/test/abilities/screen_cleaner.test.ts
#	src/test/abilities/serene_grace.test.ts
#	src/test/abilities/sheer_force.test.ts
#	src/test/abilities/shield_dust.test.ts
#	src/test/abilities/shields_down.test.ts
#	src/test/abilities/steely_spirit.test.ts
#	src/test/abilities/sturdy.test.ts
#	src/test/abilities/unseen_fist.test.ts
#	src/test/abilities/volt_absorb.test.ts
#	src/test/abilities/wind_power.test.ts
#	src/test/abilities/wind_rider.test.ts
#	src/test/abilities/wonder_skin.test.ts
#	src/test/abilities/zen_mode.test.ts
#	src/test/abilities/zero_to_hero.test.ts
#	src/test/achievements/achievement.test.ts
#	src/test/arena/arena_gravity.test.ts
#	src/test/arena/weather_fog.test.ts
#	src/test/arena/weather_strong_winds.test.ts
#	src/test/battle/battle-order.test.ts
#	src/test/battle/battle.test.ts
#	src/test/battle/error-handling.test.ts
#	src/test/battle/special_battle.test.ts
#	src/test/items/eviolite.test.ts
#	src/test/items/exp_booster.test.ts
#	src/test/items/grip_claw.test.ts
#	src/test/items/leek.test.ts
#	src/test/items/leftovers.test.ts
#	src/test/items/light_ball.test.ts
#	src/test/items/metal_powder.test.ts
#	src/test/items/quick_powder.test.ts
#	src/test/items/scope_lens.test.ts
#	src/test/items/thick_club.test.ts
#	src/test/items/toxic_orb.test.ts
#	src/test/localization/terrain.test.ts
#	src/test/moves/astonish.test.ts
#	src/test/moves/aurora_veil.test.ts
#	src/test/moves/ceaseless_edge.test.ts
#	src/test/moves/double_team.test.ts
#	src/test/moves/dragon_rage.test.ts
#	src/test/moves/dynamax_cannon.test.ts
#	src/test/moves/fissure.test.ts
#	src/test/moves/flower_shield.test.ts
#	src/test/moves/follow_me.test.ts
#	src/test/moves/gastro_acid.test.ts
#	src/test/moves/glaive_rush.test.ts
#	src/test/moves/growth.test.ts
#	src/test/moves/hard_press.test.ts
#	src/test/moves/hyper_beam.test.ts
#	src/test/moves/light_screen.test.ts
#	src/test/moves/magnet_rise.test.ts
#	src/test/moves/make_it_rain.test.ts
#	src/test/moves/multi_target.test.ts
#	src/test/moves/octolock.test.ts
#	src/test/moves/purify.test.ts
#	src/test/moves/rage_powder.test.ts
#	src/test/moves/reflect.test.ts
#	src/test/moves/rollout.test.ts
#	src/test/moves/roost.test.ts
#	src/test/moves/spikes.test.ts
#	src/test/moves/spit_up.test.ts
#	src/test/moves/spotlight.test.ts
#	src/test/moves/stockpile.test.ts
#	src/test/moves/swallow.test.ts
#	src/test/moves/tackle.test.ts
#	src/test/moves/tail_whip.test.ts
#	src/test/moves/tailwind.test.ts
#	src/test/moves/thousand_arrows.test.ts
#	src/test/moves/tidy_up.test.ts
#	src/test/ui/transfer-item.test.ts
#	src/test/utils/gameManagerUtils.ts
#	src/test/utils/testUtils.ts
#	src/ui/confirm-ui-handler.ts
#	src/ui/menu-ui-handler.ts
#	src/ui/starter-select-ui-handler.ts
#	src/ui/summary-ui-handler.ts
#	vite.config.ts
@mercurius-00 mercurius-00 marked this pull request as ready for review July 30, 2024 03:27
@mercurius-00 mercurius-00 changed the base branch from main to beta July 30, 2024 03:31
@Tempo-anon Tempo-anon merged commit c2b2cf0 into pagefaultgames:beta Jul 30, 2024
4 checks passed
@mercurius-00 mercurius-00 deleted the move-trigger branch August 14, 2024 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.