From 27139c0d8c1ceee505bd058450f067831429df9a Mon Sep 17 00:00:00 2001 From: Micah Bradbury Date: Sun, 19 May 2024 00:47:01 +1000 Subject: [PATCH 1/6] Update confuse chance to modern value (#1085) Changed from 1/2 to 1/3, as games after gen 5 use this value --- src/data/battler-tags.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 4c3f09cab30..849128517d2 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -235,7 +235,7 @@ export class ConfusedTag extends BattlerTag { pokemon.scene.queueMessage(getPokemonMessage(pokemon, ' is\nconfused!')); pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION)); - if (pokemon.randSeedInt(2)) { + if (pokemon.randSeedInt(3)) { const atk = pokemon.getBattleStat(Stat.ATK); const def = pokemon.getBattleStat(Stat.DEF); const damage = Math.ceil(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100)); From 49adedbc0f5fcc22c4931be0f61fd8e5a6939576 Mon Sep 17 00:00:00 2001 From: Vaner42 <94883874+Vaner42@users.noreply.github.com> Date: Sat, 18 May 2024 22:47:59 +0800 Subject: [PATCH 2/6] Fixed the replace method that was not executed in check female version exists; And fixed pokefan key in localization; (#1086) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translate 'trainer' into Simplified Chinese. * fixed translate 'hau'、 ‘diantha’ 、‘leon’ into Simplified Chinese. * Fixed the replace method that was not executed in check female version exists; And fixed pokefan key in localization; --------- Co-authored-by: Junhan --- src/data/trainer-config.ts | 2 +- src/locales/zh_CN/trainers.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 84fb4ffc15c..685662a2114 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -505,7 +505,7 @@ export class TrainerConfig { initI18n(); } // Check if the female version exists in the i18n file - if (i18next.exists(`trainerClasses:${this.name.toLowerCase().replace}`)) { + if (i18next.exists(`trainerClasses:${this.name.toLowerCase().replace()}`)) { // If it does, return return ret + "_female"; } else { diff --git a/src/locales/zh_CN/trainers.ts b/src/locales/zh_CN/trainers.ts index e7ca1093268..2dd10d49ef4 100644 --- a/src/locales/zh_CN/trainers.ts +++ b/src/locales/zh_CN/trainers.ts @@ -68,8 +68,8 @@ export const trainerClasses: SimpleTranslationEntries = { "officer": "警察", "parasol_lady": "阳伞姐姐", "pilot": "飞行员", - "pokefan": "发烧友俱乐部", - "pokefan_family": "同好夫妇", + "poké_fan": "发烧友俱乐部", + "poké_fan_family": "同好夫妇", "preschooler": "幼儿园小朋友", "preschooler_female": "幼儿园小朋友", "preschoolers": "幼儿园小朋友组合", From ab64eb5d5bfa6149a078706b349a2fce2fce921b Mon Sep 17 00:00:00 2001 From: Rei1mu <94012185+Rei1mu@users.noreply.github.com> Date: Sat, 18 May 2024 22:52:00 +0800 Subject: [PATCH 3/6] update zh_CN translation (#1089) --- src/locales/zh_CN/battle.ts | 28 ++++++++++++------------- src/locales/zh_CN/command-ui-handler.ts | 2 +- src/locales/zh_CN/menu.ts | 10 ++++----- src/locales/zh_CN/weather.ts | 16 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts index cf58add1d6d..f698fcc32ab 100644 --- a/src/locales/zh_CN/battle.ts +++ b/src/locales/zh_CN/battle.ts @@ -2,23 +2,23 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} 出现了。", - "trainerAppeared": "{{trainerName}}\n想要和你对战!", - "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", - "singleWildAppeared": "一只野生 {{pokemonName}} 出现了。!", - "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了。!", - "playerComeBack": "回来吧, {{pokemonName}}!", - "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}!", - "playerGo": "去吧! {{pokemonName}}!", - "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}!", - "switchQuestion": "要更换\n{{pokemonName}}吗?", - "trainerDefeated": `你击败了\n{{trainerName}}!`, - "pokemonCaught": "{{pokemonName}} 被抓住了!", + "trainerAppeared": "{{trainerName}}\n想要和你对战！", + "trainerAppearedDouble": "{{trainerName}}\n想要和你对战！", + "singleWildAppeared": "一只野生 {{pokemonName}} 出现了！", + "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了！", + "playerComeBack": "回来吧, {{pokemonName}}！", + "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}！", + "playerGo": "去吧！ {{pokemonName}}！", + "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}！", + "switchQuestion": "要更换\n{{pokemonName}}吗？", + "trainerDefeated": `你击败了\n{{trainerName}}！`, + "pokemonCaught": "{{pokemonName}} 被抓住了！", "pokemon": "宝可梦", - "sendOutPokemon": "上吧！ {{pokemonName}}!", + "sendOutPokemon": "上吧！ {{pokemonName}}！", "hitResultCriticalHit": "击中了要害！", "hitResultSuperEffective": "效果拔群！", "hitResultNotVeryEffective": "收效甚微…", - "hitResultNoEffect": "对 {{pokemonName}} 没有效果！!", + "hitResultNoEffect": "对 {{pokemonName}} 没有效果！！", "hitResultOneHitKO": "一击必杀！", "attackFailed": "但是失败了！", "attackHitsCount": `击中 {{count}} 次！`, @@ -32,7 +32,7 @@ export const battle: SimpleTranslationEntries = { "learnMoveNotLearned": "{{pokemonName}} 没有学会 {{moveName}}。", "learnMoveForgetQuestion": "要忘记哪个技能？", "learnMoveForgetSuccess": "{{pokemonName}} 忘记了\n如何使用 {{moveName}}。", - "countdownPoof": "@d{32}1, @d{15}2, @d{15}和@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}噗!", + "countdownPoof": "@d{32}1, @d{15}2, @d{15}和@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}噗！", "learnMoveAnd": "然后...", "levelCapUp": "等级上限提升到 {{levelCap}}！", "moveNotImplemented": "{{moveName}} 尚未实装，无法选择。", diff --git a/src/locales/zh_CN/command-ui-handler.ts b/src/locales/zh_CN/command-ui-handler.ts index 50f94864cc2..3c17efffd8a 100644 --- a/src/locales/zh_CN/command-ui-handler.ts +++ b/src/locales/zh_CN/command-ui-handler.ts @@ -5,5 +5,5 @@ export const commandUiHandler: SimpleTranslationEntries = { "ball": "精灵球", "pokemon": "宝可梦", "run": "逃跑", - "actionMessage": "要让\n{{pokemonName}} 做什么?", + "actionMessage": "要让\n{{pokemonName}} 做什么？", } as const; \ No newline at end of file diff --git a/src/locales/zh_CN/menu.ts b/src/locales/zh_CN/menu.ts index 14bba6f5e6e..c80f55eac61 100644 --- a/src/locales/zh_CN/menu.ts +++ b/src/locales/zh_CN/menu.ts @@ -35,11 +35,11 @@ export const menu: SimpleTranslationEntries = { "boyOrGirl": "你是男孩还是女孩？", "boy": "男孩", "girl": "女孩", - "evolving": "咦?\n{{pokemonName}} 开始进化了!", - "stoppedEvolving": "{{pokemonName}} 停止了进化.", - "pauseEvolutionsQuestion": "你确定要停止 {{pokemonName}} 的进化吗?\n你可以在队伍界面中重新进化.", - "evolutionsPaused": "{{pokemonName}} 的进化停止了.", - "evolutionDone": "恭喜!\n你的 {{pokemonName}} 进化成了 {{evolvedPokemonName}}!", + "evolving": "咦？\n{{pokemonName}} 开始进化了！", + "stoppedEvolving": "{{pokemonName}} 停止了进化。", + "pauseEvolutionsQuestion": "你确定要停止 {{pokemonName}} 的进化吗？\n你可以在队伍界面中重新进化。", + "evolutionsPaused": "{{pokemonName}} 的进化停止了。", + "evolutionDone": "恭喜！\n你的 {{pokemonName}} 进化成了 {{evolvedPokemonName}}！", "dailyRankings": "每日排名", "weeklyRankings": "每周排名", "noRankings": "无排名", diff --git a/src/locales/zh_CN/weather.ts b/src/locales/zh_CN/weather.ts index 5d88ac351bc..f78de2339c0 100644 --- a/src/locales/zh_CN/weather.ts +++ b/src/locales/zh_CN/weather.ts @@ -4,7 +4,7 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n"; * The weather namespace holds text displayed when weather is active during a battle */ export const weather: SimpleTranslationEntries = { - "sunnyStartMessage": "日照变强了!", + "sunnyStartMessage": "日照变强了！", "sunnyLapseMessage": "日照很强。", "sunnyClearMessage": "日照复原了。", @@ -15,22 +15,22 @@ export const weather: SimpleTranslationEntries = { "sandstormStartMessage": "开始刮沙暴了！", "sandstormLapseMessage": "沙暴肆虐。", "sandstormClearMessage": "沙暴停止了！", - "sandstormDamageMessage": "沙暴袭击了{{pokemonPrefix}}{{pokemonName}}!", + "sandstormDamageMessage": "沙暴袭击了{{pokemonPrefix}}{{pokemonName}}！", - "hailStartMessage": "开始下冰雹了!", + "hailStartMessage": "开始下冰雹了！", "hailLapseMessage": "冰雹继续肆虐。", "hailClearMessage": "冰雹不再下了。", - "hailDamageMessage": "冰雹袭击了{{pokemonPrefix}}{{pokemonName}}!", + "hailDamageMessage": "冰雹袭击了{{pokemonPrefix}}{{pokemonName}}！", - "snowStartMessage": "开始下雪了!", + "snowStartMessage": "开始下雪了！", "snowLapseMessage": "雪继续下。", "snowClearMessage": "雪停了。", - "fogStartMessage": "起雾了!", + "fogStartMessage": "起雾了！", "fogLapseMessage": "雾很浓。", "fogClearMessage": "雾散了。", - "heavyRainStartMessage": "开始下起了暴雨!", + "heavyRainStartMessage": "开始下起了暴雨！", "heavyRainLapseMessage": "暴雨势头不减。", "heavyRainClearMessage": "暴雨停了。", @@ -38,7 +38,7 @@ export const weather: SimpleTranslationEntries = { "harshSunLapseMessage": "强日照势头不减。", "harshSunClearMessage": "日照复原了。", - "strongWindsStartMessage": "吹起了神秘的乱流!", + "strongWindsStartMessage": "吹起了神秘的乱流！", "strongWindsLapseMessage": "神秘的乱流势头不减。", "strongWindsClearMessage": "神秘的乱流停止了。" } \ No newline at end of file From 344a17c8fca9ef4b178a0d4aa1f580a023324989 Mon Sep 17 00:00:00 2001 From: Jaime Date: Sat, 18 May 2024 16:53:18 +0200 Subject: [PATCH 4/6] Fix TM moves for Beldum line (#1090) --- src/data/tms.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/data/tms.ts b/src/data/tms.ts index eeccd9310a3..1eff9102c4c 100644 --- a/src/data/tms.ts +++ b/src/data/tms.ts @@ -20889,7 +20889,6 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, - Species.METANG, Species.METAGROSS, Species.REGIROCK, Species.REGICE, @@ -32522,6 +32521,8 @@ export const tmSpecies: TmSpecies = { Species.DUSCLOPS, Species.CHIMECHO, Species.ABSOL, + Species.METANG, + Species.METAGROSS, Species.LATIAS, Species.LATIOS, Species.JIRACHI, @@ -35468,6 +35469,8 @@ export const tmSpecies: TmSpecies = { Species.ZANGOOSE, Species.KECLEON, Species.DUSCLOPS, + Species.METANG, + Species.METAGROSS, Species.REGIROCK, Species.REGICE, Species.REGISTEEL, @@ -37725,6 +37728,7 @@ export const tmSpecies: TmSpecies = { Species.BANETTE, Species.CHIMECHO, Species.ABSOL, + Species.METAGROSS, [ Species.DEOXYS, '', @@ -47702,6 +47706,7 @@ export const tmSpecies: TmSpecies = { Species.GOREBYSS, Species.RELICANTH, Species.SALAMENCE, + Species.METANG, Species.METAGROSS, Species.REGIROCK, Species.REGICE, @@ -48471,6 +48476,7 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, + Species.METAGROSS, Species.REGISTEEL, Species.LATIAS, Species.LATIOS, @@ -50632,6 +50638,7 @@ export const tmSpecies: TmSpecies = { Species.ABSOL, Species.RELICANTH, Species.SALAMENCE, + Species.METAGROSS, Species.REGIROCK, Species.GROUDON, Species.RAYQUAZA, @@ -52586,6 +52593,8 @@ export const tmSpecies: TmSpecies = { Species.CAMERUPT, Species.TORKOAL, Species.WALREIN, + Species.METANG, + Species.METAGROSS, Species.REGIROCK, Species.REGICE, Species.REGISTEEL, @@ -62371,6 +62380,7 @@ export const tmSpecies: TmSpecies = { Species.BAGON, Species.SHELGON, Species.SALAMENCE, + Species.BELDUM, Species.METANG, Species.METAGROSS, Species.REGIROCK, @@ -63367,6 +63377,8 @@ export const tmSpecies: TmSpecies = { Species.TROPIUS, Species.SNORUNT, Species.GLALIE, + Species.METANG, + Species.METAGROSS, Species.TURTWIG, Species.GROTLE, Species.TORTERRA, From 2682c2faa35013b1d12da6d579d5085d2d3f7af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ricardo=20Fleury=20Oliveira?= Date: Sat, 18 May 2024 11:55:31 -0300 Subject: [PATCH 5/6] fix ptBR mint (#1092) --- src/locales/pt_BR/modifier-type.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/pt_BR/modifier-type.ts b/src/locales/pt_BR/modifier-type.ts index 1ffc6d3187f..faf10fbab2b 100644 --- a/src/locales/pt_BR/modifier-type.ts +++ b/src/locales/pt_BR/modifier-type.ts @@ -45,7 +45,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "Aumenta permanentemente os PP para o movimento de um Pokémon em {{upPoints}} para cada 5 PP máximos (máximo 3)", }, "PokemonNatureChangeModifierType": { - name: "{{natureName}} Mint", + name: "Hortelã {{natureName}}", description: "Muda a natureza de um Pokémon para {{natureName}} e a desbloqueia permanentemente para seu inicial", }, "DoubleBattleChanceBoosterModifierType": { From 8ccd8085db7e33ad7b8a73b527fdb0c13689fd26 Mon Sep 17 00:00:00 2001 From: Alessandro Bruzzese <69127023+Bruzzii@users.noreply.github.com> Date: Sat, 18 May 2024 16:56:20 +0200 Subject: [PATCH 6/6] Update Italian modifier-type.ts (#1094) --- src/locales/it/modifier-type.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/locales/it/modifier-type.ts b/src/locales/it/modifier-type.ts index 87deece71fe..70303dd7acd 100644 --- a/src/locales/it/modifier-type.ts +++ b/src/locales/it/modifier-type.ts @@ -19,8 +19,8 @@ export const modifierType: ModifierTypeTranslationEntries = { "PokemonHpRestoreModifierType": { description: "Restituisce {{restorePoints}} PS o {{restorePercent}}% PS ad un Pokémon, a seconda del valore più alto", extra: { - "fully": "Restituisce tutti gli PS ad un Pokémon", - "fullyWithStatus": "Restituisce tutti gli PS ad un Pokémon e lo cura da ogni stato", + "fully": "Restituisce tutti i PS ad un Pokémon", + "fullyWithStatus": "Restituisce tutti i PS ad un Pokémon e lo cura da ogni stato", } }, "PokemonReviveModifierType": { @@ -67,7 +67,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "Aumenta {{statName}} di base del possessore del 10%", }, "AllPokemonFullHpRestoreModifierType": { - description: "Recupera il 100% degli PS per tutti i Pokémon", + description: "Recupera il 100% dei PS per tutti i Pokémon", }, "AllPokemonFullReviveModifierType": { description: "Rianima tutti i Pokémon esausti restituendogli tutti i PS", @@ -195,7 +195,7 @@ export const modifierType: ModifierTypeTranslationEntries = { "MULTI_LENS": { name: "Multilente" }, - "HEALING_CHARM": { name: "Curamuleto", description: "Aumenta del 10% l'efficacia delle mosse e degli oggetti che ripristinano gli PS (escluse le rianimazioni)" }, + "HEALING_CHARM": { name: "Curamuleto", description: "Aumenta del 10% l'efficacia delle mosse e degli oggetti che ripristinano i PS (escluse le rianimazioni)" }, "CANDY_JAR": { name: "Barattolo di caramelle", description: "Aumenta di 1 il numero di livelli aggiunti dalle Caramelle Rare" }, "BERRY_POUCH": { name: "Porta Bacche", description: "Aggiunge il 25% di possibilità che una bacca usata non venga consumata" },