diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 03c4c984215..79776ba81e8 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -17,7 +17,8 @@ export enum SpeciesWildEvolutionDelay { SHORT, MEDIUM, LONG = 4, - VERY_LONG = 8 + VERY_LONG = 8, + NEVER = 16 } export enum EvolutionItem { @@ -228,7 +229,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.SLOWPOKE]: [ new SpeciesEvolution(Species.SLOWBRO, 37, null, null), - new SpeciesEvolution(Species.SLOWKING, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => true /* King's Rock */), SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.SLOWKING, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.MAGNEMITE]: [ new SpeciesEvolution(Species.MAGNETON, 30, null, null) @@ -1261,7 +1262,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.POLIWHIRL]: [ new SpeciesEvolution(Species.POLIWRATH, 1, EvolutionItem.WATER_STONE, null, SpeciesWildEvolutionDelay.LONG), - new SpeciesEvolution(Species.POLITOED, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => true /* King's Rock */), SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesEvolution(Species.POLITOED, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.WEEPINBELL]: [ new SpeciesEvolution(Species.VICTREEBEL, 1, EvolutionItem.LEAF_STONE, null, SpeciesWildEvolutionDelay.LONG) @@ -1636,7 +1637,8 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM) ], [Species.GIMMIGHOUL]: [ - new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 ), SpeciesWildEvolutionDelay.VERY_LONG) + new SpeciesFormEvolution(Species.GHOLDENGO, "chest", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 ), SpeciesWildEvolutionDelay.VERY_LONG), + new SpeciesFormEvolution(Species.GHOLDENGO, "roaming", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 ), SpeciesWildEvolutionDelay.NEVER) ] }; diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index 09d34178772..4504ec20451 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -1609,9 +1609,9 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 12, Moves.DRAGON_BREATH ], [ 16, Moves.CURSE ], [ 20, Moves.ROCK_SLIDE ], + [ 22, Moves.GYRO_BALL ], //Custom, from USUM [ 24, Moves.SCREECH ], [ 28, Moves.SAND_TOMB ], - [ 30, Moves.IRON_DEFENSE ], [ 32, Moves.STEALTH_ROCK ], [ 36, Moves.SLAM ], [ 40, Moves.SANDSTORM ], diff --git a/src/locales/de/modifier-type.ts b/src/locales/de/modifier-type.ts index 90ac9413466..5d0e02c93bf 100644 --- a/src/locales/de/modifier-type.ts +++ b/src/locales/de/modifier-type.ts @@ -323,6 +323,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Saurer Apfel", "STRAWBERRY_SWEET": "Zucker-Erdbeere", "UNREMARKABLE_TEACUP": "Simple Teeschale", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Löchrige Kanne", "BLACK_AUGURITE": "Schwarzaugit", diff --git a/src/locales/de/party-ui-handler.ts b/src/locales/de/party-ui-handler.ts index 097b670c768..37133a629a2 100644 --- a/src/locales/de/party-ui-handler.ts +++ b/src/locales/de/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Entwicklung fortsetzen", "REVIVE": "Wiederbeleben", "RENAME": "Umbenennen", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Wähle ein Pokémon.", "doWhatWithThisPokemon": "Was soll mit diesem Pokémon geschehen?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} trägt bereits zu viele dieser Items!", "anyEffect": "Das würde keine Wirkung zeigen.", "unpausedEvolutions": "Entwicklungen für {{pokemonName}} wurden wieder aktiviert.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Willst du wirklich {{fusionName}} von {{pokemonName}} defusionieren? {{fusionName}} wird freigelassen.", "wasReverted": "{{fusionName}} verwandelt sich in {{pokemonName}} zurück.", "releaseConfirmation": "Möchtest du {{pokemonName}} wirklich freilassen?", diff --git a/src/locales/en/modifier-type.ts b/src/locales/en/modifier-type.ts index c6c98e44a92..534b6c0c6b3 100644 --- a/src/locales/en/modifier-type.ts +++ b/src/locales/en/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Tart Apple", "STRAWBERRY_SWEET": "Strawberry Sweet", "UNREMARKABLE_TEACUP": "Unremarkable Teacup", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Chipped Pot", "BLACK_AUGURITE": "Black Augurite", diff --git a/src/locales/en/party-ui-handler.ts b/src/locales/en/party-ui-handler.ts index 4f300dd36ea..5b47df3c8fd 100644 --- a/src/locales/en/party-ui-handler.ts +++ b/src/locales/en/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Unpause Evolution", "REVIVE": "Revive", "RENAME": "Rename", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Choose a Pokémon.", "doWhatWithThisPokemon": "Do what with this Pokémon?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} has too many\nof this item!", "anyEffect": "It won't have any effect.", "unpausedEvolutions": "Evolutions have been unpaused for {{pokemonName}}.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Do you really want to unsplice {{fusionName}}\nfrom {{pokemonName}}? {{fusionName}} will be lost.", "wasReverted": "{{fusionName}} was reverted to {{pokemonName}}.", "releaseConfirmation": "Do you really want to release {{pokemonName}}?", diff --git a/src/locales/es/modifier-type.ts b/src/locales/es/modifier-type.ts index d2bd44a0f06..a9968bcc2f2 100644 --- a/src/locales/es/modifier-type.ts +++ b/src/locales/es/modifier-type.ts @@ -320,6 +320,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Manzana Ácida", "STRAWBERRY_SWEET": "Confite Fresa", "UNREMARKABLE_TEACUP": "Cuenco Mediocre", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Tetera Rota", "BLACK_AUGURITE": "Mineral Negro", diff --git a/src/locales/es/party-ui-handler.ts b/src/locales/es/party-ui-handler.ts index cbbd6734b62..e821f18dec4 100644 --- a/src/locales/es/party-ui-handler.ts +++ b/src/locales/es/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Reanudar Evolución", "REVIVE": "Revivir", "RENAME": "Rename", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Elige a un Pokémon.", "doWhatWithThisPokemon": "¿Que quieres hacer con este Pokémon?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "¡{{pokemonName}} tiene demasiados\nde este objeto!", "anyEffect": "No tendría ningún efecto.", "unpausedEvolutions": "Se reanudó las evoluciones de {{pokemonName}}.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "¿Seguro que quiere separar a {{fusionName}}\nde {{pokemonName}}? {{fusionName}} se perderá.", "wasReverted": "{{fusionName}} se revirtió a {{pokemonName}}.", "releaseConfirmation": "¿Quieres liberar a {{pokemonName}}?", diff --git a/src/locales/fr/modifier-type.ts b/src/locales/fr/modifier-type.ts index 671a122f992..d84859e1b2c 100644 --- a/src/locales/fr/modifier-type.ts +++ b/src/locales/fr/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Pomme Acidulée", "STRAWBERRY_SWEET": "Fraise en Sucre", "UNREMARKABLE_TEACUP": "Bol Médiocre", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Théière Ébréchée", "BLACK_AUGURITE": "Obsidienne", diff --git a/src/locales/fr/party-ui-handler.ts b/src/locales/fr/party-ui-handler.ts index 158a6e8416a..0eccfe767e6 100644 --- a/src/locales/fr/party-ui-handler.ts +++ b/src/locales/fr/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Réactiver Évolution", "REVIVE": "Ranimer", "RENAME": "Renommer", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Sélectionnez un Pokémon.", "doWhatWithThisPokemon": "Que faire avec ce Pokémon ?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} porte trop\nd’exemplaires de cet objet !", "anyEffect": "Cela n’aura aucun effet.", "unpausedEvolutions": "{{pokemonName}} peut de nouveau évoluer.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Voulez-vous vraiment séparer {{fusionName}}\nde {{pokemonName}} ? {{fusionName}} sera perdu.", "wasReverted": "{{fusionName}} est redevenu {{pokemonName}}.", "releaseConfirmation": "Voulez-vous relâcher {{pokemonName}} ?", diff --git a/src/locales/it/modifier-type.ts b/src/locales/it/modifier-type.ts index 618d19395e5..159d4ba1fd0 100644 --- a/src/locales/it/modifier-type.ts +++ b/src/locales/it/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Aspropomo", "STRAWBERRY_SWEET": "Bonbonfragola", "UNREMARKABLE_TEACUP": "Tazza dozzinale", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Teiera crepata", "BLACK_AUGURITE": "Augite nera", diff --git a/src/locales/it/party-ui-handler.ts b/src/locales/it/party-ui-handler.ts index 979e04f3ea1..0230a75ef9c 100644 --- a/src/locales/it/party-ui-handler.ts +++ b/src/locales/it/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Unpause Evolution", "REVIVE": "Revive", "RENAME": "Rinomina", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Choose a Pokémon.", "doWhatWithThisPokemon": "Do what with this Pokémon?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} has too many\nof this item!", "anyEffect": "It won't have any effect.", "unpausedEvolutions": "Evolutions have been unpaused for {{pokemonName}}.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Do you really want to unsplice {{fusionName}}\nfrom {{pokemonName}}? {{fusionName}} will be lost.", "wasReverted": "{{fusionName}} was reverted to {{pokemonName}}.", "releaseConfirmation": "Do you really want to release {{pokemonName}}?", diff --git a/src/locales/ko/modifier-type.ts b/src/locales/ko/modifier-type.ts index f09fba0b09a..c3e8589ee74 100644 --- a/src/locales/ko/modifier-type.ts +++ b/src/locales/ko/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "새콤한사과", "STRAWBERRY_SWEET": "딸기사탕공예", "UNREMARKABLE_TEACUP": "범작찻잔", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "이빠진포트", "BLACK_AUGURITE": "검은휘석", diff --git a/src/locales/ko/party-ui-handler.ts b/src/locales/ko/party-ui-handler.ts index ff5d81eeb52..c37e27aa3f8 100644 --- a/src/locales/ko/party-ui-handler.ts +++ b/src/locales/ko/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "진화 재개", "REVIVE": "되살린다", "RENAME": "닉네임 바꾸기", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "포켓몬을 선택하세요.", "doWhatWithThisPokemon": "포켓몬을 어떻게 하겠습니까?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}}[[는]] 지닌 도구의 수가\n너무 많습니다", "anyEffect": "써도 효과가 없다.", "unpausedEvolutions": "{{pokemonName}}의 진화가 재개되었다.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "{{pokemonName}}로부터 {{fusionName}}의 융합을 해제하시겠습니까?\n{{fusionName}}는 사라지게 됩니다.", "wasReverted": "{{fusionName}}은 {{pokemonName}}의 모습으로 돌아갔습니다!", "releaseConfirmation": "{{pokemonName}}[[를]]\n정말 놓아주겠습니까?", diff --git a/src/locales/pt_BR/modifier-type.ts b/src/locales/pt_BR/modifier-type.ts index a5cddaed235..3c4ca151967 100644 --- a/src/locales/pt_BR/modifier-type.ts +++ b/src/locales/pt_BR/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "Maçã Azeda", "STRAWBERRY_SWEET": "Doce de Morango", "UNREMARKABLE_TEACUP": "Xícara Comum", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "Pote Lascado", "BLACK_AUGURITE": "Mineral Negro", diff --git a/src/locales/pt_BR/party-ui-handler.ts b/src/locales/pt_BR/party-ui-handler.ts index 08132b4bfc0..29aceb56fc7 100644 --- a/src/locales/pt_BR/party-ui-handler.ts +++ b/src/locales/pt_BR/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Ativar Evolução", "REVIVE": "Reviver", "RENAME": "Renomear", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Escolha um Pokémon.", "doWhatWithThisPokemon": "O que você deseja fazer?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} já tem\nmuitos desse item!", "anyEffect": "Isso não terá nenhum efeito.", "unpausedEvolutions": "Evoluções foram despausadas para {{pokemonName}}.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Você realmente deseja desfazer a fusão de {{fusionName}}\ncom {{pokemonName}}? {{fusionName}} será perdido.", "wasReverted": "{{fusionName}} foi revertido para {{pokemonName}}.", "releaseConfirmation": "Você realmente deseja soltar {{pokemonName}}?", diff --git a/src/locales/zh_CN/modifier-type.ts b/src/locales/zh_CN/modifier-type.ts index 71f5b21ba81..5d226ee2457 100644 --- a/src/locales/zh_CN/modifier-type.ts +++ b/src/locales/zh_CN/modifier-type.ts @@ -321,6 +321,19 @@ export const modifierType: ModifierTypeTranslationEntries = { "TART_APPLE": "酸酸苹果", "STRAWBERRY_SWEET": "草莓糖饰", "UNREMARKABLE_TEACUP": "凡作茶碗", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Dragon Scale", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Razor Claw", + "RAZOR_FANG": "Razor Fang", + "REAPER_CLOTH": "Reaper Cloth", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", "CHIPPED_POT": "缺损的茶壶", "BLACK_AUGURITE": "黑奇石", diff --git a/src/locales/zh_CN/party-ui-handler.ts b/src/locales/zh_CN/party-ui-handler.ts index 7d70ddd1503..045c4cbf77f 100644 --- a/src/locales/zh_CN/party-ui-handler.ts +++ b/src/locales/zh_CN/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "解除进化暂停", "REVIVE": "复活", "RENAME": "起名", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "选择一只宝可梦。", "doWhatWithThisPokemon": "要对宝可梦做什么?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}}拥有\n太多这个道具了!", "anyEffect": "即便使用也无效果哦。", "unpausedEvolutions": "{{pokemonName}}的进化停止了。", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "真的要把{{fusionName}}\n从{{pokemonName}}身上分离吗? {{fusionName}}会就此消失。", "wasReverted": "{{fusionName}}恢复成了{{pokemonName}}。", "releaseConfirmation": "你真要放生{{pokemonName}}吗?", diff --git a/src/locales/zh_TW/modifier-type.ts b/src/locales/zh_TW/modifier-type.ts index 3d56deca3d7..ca04dd467a0 100644 --- a/src/locales/zh_TW/modifier-type.ts +++ b/src/locales/zh_TW/modifier-type.ts @@ -387,6 +387,19 @@ export const modifierType: ModifierTypeTranslationEntries = { TART_APPLE: "酸酸蘋果", STRAWBERRY_SWEET: "草莓糖飾", UNREMARKABLE_TEACUP: "凡作茶碗", + UPGRADE: "Upgrade", + DUBIOUS_DISC: "Dubious Disc", + DRAGON_SCALE: "Dragon Scale", + PRISM_SCALE: "Prism Scale", + RAZOR_CLAW: "Razor Claw", + RAZOR_FANG: "Razor Fang", + REAPER_CLOTH: "Reaper Cloth", + ELECTIRIZER: "Electirizer", + MAGMARIZER: "Magmarizer", + PROTECTOR: "Protector", + SACHET: "Sachet", + WHIPPED_DREAM: "Whipped Dream", + LEADERS_CREST: "Leader's Crest", CHIPPED_POT: "缺損的茶壺", BLACK_AUGURITE: "黑奇石", GALARICA_CUFF: "伽勒豆蔻手環", diff --git a/src/locales/zh_TW/party-ui-handler.ts b/src/locales/zh_TW/party-ui-handler.ts index c981e41af0e..d470e7d1096 100644 --- a/src/locales/zh_TW/party-ui-handler.ts +++ b/src/locales/zh_TW/party-ui-handler.ts @@ -17,6 +17,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "UNPAUSE_EVOLUTION": "Unpause Evolution", "REVIVE": "Revive", "RENAME": "Rename", + "PAUSE_EVOLUTION": "Pause Evolution", "choosePokemon": "Choose a Pokémon.", "doWhatWithThisPokemon": "Do what with this Pokémon?", @@ -26,6 +27,7 @@ export const partyUiHandler: SimpleTranslationEntries = { "tooManyItems": "{{pokemonName}} has too many\nof this item!", "anyEffect": "It won't have any effect.", "unpausedEvolutions": "Evolutions have been unpaused for {{pokemonName}}.", + "pausedEvolutions": "Evolutions have been paused for {{pokemonName}}.", "unspliceConfirmation": "Do you really want to unsplice {{fusionName}}\nfrom {{pokemonName}}? {{fusionName}} will be lost.", "wasReverted": "{{fusionName}} was reverted to {{pokemonName}}.", "releaseConfirmation": "Do you really want to release {{pokemonName}}?", diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 883325ceb45..c46bc5b1ebb 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -999,11 +999,11 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator { } const evolutionItemPool = [ - party.filter(p => pokemonEvolutions.hasOwnProperty(p.species.speciesId) && !p.pauseEvolutions).map(p => { + party.filter(p => pokemonEvolutions.hasOwnProperty(p.species.speciesId) && (!p.pauseEvolutions || p.species.speciesId === Species.SLOWPOKE)).map(p => { const evolutions = pokemonEvolutions[p.species.speciesId]; return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFormKey()) && (!e.condition || e.condition.predicate(p))); }).flat(), - party.filter(p => p.isFusion() && pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) && !p.pauseEvolutions).map(p => { + party.filter(p => p.isFusion() && pokemonEvolutions.hasOwnProperty(p.fusionSpecies.speciesId) && (!p.pauseEvolutions || p.fusionSpecies.speciesId === Species.SLOWPOKE)).map(p => { const evolutions = pokemonEvolutions[p.fusionSpecies.speciesId]; return evolutions.filter(e => e.item !== EvolutionItem.NONE && (e.evoFormKey === null || (e.preFormKey || "") === p.getFusionFormKey()) && (!e.condition || e.condition.predicate(p))); }).flat() diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 623b60fda87..cc083a89b0d 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -410,7 +410,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.clearOptions(); ui.playSelect(); pokemon.pauseEvolutions = !pokemon.pauseEvolutions; - this.showText(i18next.t("partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => this.showText(null, 0), null, true); + this.showText(i18next.t(pokemon.pauseEvolutions? "partyUiHandler:unpausedEvolutions" : "partyUiHandler:pausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => this.showText(null, 0), null, true); } else if (option === PartyOption.UNSPLICE) { this.clearOptions(); ui.playSelect(); @@ -903,7 +903,7 @@ export default class PartyUiHandler extends MessageUiHandler { const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM]; optionName = `${modifier.active ? i18next.t("partyUiHandler:DEACTIVATE") : i18next.t("partyUiHandler:ACTIVATE")} ${modifier.type.name}`; } else if (option === PartyOption.UNPAUSE_EVOLUTION) { - optionName = `${pokemon.pauseEvolutions ? "Unpause" : "Pause"} Evolution`; + optionName = `${pokemon.pauseEvolutions ? i18next.t("partyUiHandler:UNPAUSE_EVOLUTION") : i18next.t("partyUiHandler:PAUSE_EVOLUTION")}`; } else { if (this.localizedOptions.includes(option)) { optionName = i18next.t(`partyUiHandler:${PartyOption[option]}`);