From d28c77db21befeb5b0fe14a2c69b667aa178fb4e Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Fri, 27 Sep 2024 22:56:40 +0200 Subject: [PATCH 1/3] [Localization] Missing items translations (#4470) * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update src/locales/ko/modifier-type.json * Update src/locales/ko/modifier-type.json * Update modifier-type.json * Update src/locales/it/modifier-type.json * Update src/locales/it/modifier-type.json * Update src/locales/ko/modifier-type.json * Update modifier-type.json * Update src/locales/es/modifier-type.json * Update src/locales/ja/modifier-type.json * Update src/locales/ko/modifier-type.json Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com> * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update battler-tags.json * Update modifier-type.json * Update battler-tags.json * Update battler-tags.json --------- Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: returntoice <171243264+returntoice@users.noreply.github.com> --- src/locales/es/modifier-type.json | 20 ++++++++++++++++++++ src/locales/fr/modifier-type.json | 17 +++++++++++++++++ src/locales/it/modifier-type.json | 20 ++++++++++++++++++++ src/locales/ja/modifier-type.json | 20 ++++++++++++++++++++ src/locales/ko/modifier-type.json | 22 +++++++++++++++++++++- src/locales/pt_BR/modifier-type.json | 20 ++++++++++++++++++++ src/locales/zh_CN/modifier-type.json | 20 ++++++++++++++++++++ src/locales/zh_TW/modifier-type.json | 20 ++++++++++++++++++++ 8 files changed, 158 insertions(+), 1 deletion(-) diff --git a/src/locales/es/modifier-type.json b/src/locales/es/modifier-type.json index 365a8d9bfed..668f08e443d 100644 --- a/src/locales/es/modifier-type.json +++ b/src/locales/es/modifier-type.json @@ -358,6 +358,10 @@ "name": "Llamasfera", "description": "Extraña esfera que causa quemaduras a quien la usa en combate." }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "Tesoros", + "description": "¡A este Pokémon le encantan los tesoros! ¡Sigue coleccionandólos y tal vez pase algo!" + }, "BATON": { "name": "Testigo", "description": "Permite pasar los efectos al cambiar de Pokémon, también evita las trampas." @@ -495,6 +499,22 @@ "TART_APPLE": "Manzana ácida", "STRAWBERRY_SWEET": "Confite fresa", "UNREMARKABLE_TEACUP": "Cuenco mediocre", + "UPGRADE": "Mejora", + "DUBIOUS_DISC": "Disco Extraño", + "DRAGON_SCALE": "Escama Dragón", + "PRISM_SCALE": "Escama Bella", + "RAZOR_CLAW": "Garra Afilada", + "RAZOR_FANG": "Colmillo Agudo", + "REAPER_CLOTH": "Tela Terrible", + "ELECTIRIZER": "Electrizador", + "MAGMARIZER": "Magmatizador", + "PROTECTOR": "Protector", + "SACHET": "Saquito Fragante", + "WHIPPED_DREAM": "Dulce de Nata", + "LEADERS_CREST": "Distintivo de Líder", + "SUN_FLUTE": "Flauta Solar", + "MOON_FLUTE": "Flauta Lunar", + "CHIPPED_POT": "Tetera rota", "BLACK_AUGURITE": "Mineral negro", "GALARICA_CUFF": "Brazal galanuez", diff --git a/src/locales/fr/modifier-type.json b/src/locales/fr/modifier-type.json index 74c7599fea7..465ffc82572 100644 --- a/src/locales/fr/modifier-type.json +++ b/src/locales/fr/modifier-type.json @@ -240,6 +240,8 @@ "TOXIC_ORB": { "name": "Orbe Toxique", "description": "Empoisonne gravement son porteur à la fin du tour s’il n’a pas déjà de problème de statut." }, "FLAME_ORB": { "name": "Orbe Flamme", "description": "Brule son porteur à la fin du tour s’il n’a pas déjà de problème de statut." }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { "name": "Trésors", "description": "Ce Pokémon adore les trésors ! Ramassez-en le plus possible et voyez ce qu’il se passe !"}, + "BATON": { "name": "Témoin", "description": "Permet de transmettre les effets en cas de changement de Pokémon. Ignore les pièges." }, "SHINY_CHARM": { "name": "Charme Chroma", "description": "Augmente énormément les chances de rencontrer un Pokémon sauvage chromatique." }, @@ -330,6 +332,21 @@ "TART_APPLE": "Pomme Acidulée", "STRAWBERRY_SWEET": "Fraise en Sucre", "UNREMARKABLE_TEACUP": "Bol Médiocre", + "UPGRADE": "Améliorator", + "DUBIOUS_DISC": "CD Douteux", + "DRAGON_SCALE": "Écaille Draco", + "PRISM_SCALE": "Bel’Écaille", + "RAZOR_CLAW": "Griffe Rasoir", + "RAZOR_FANG": "Croc Rasoir", + "REAPER_CLOTH": "Tissu Fauche", + "ELECTIRIZER": "Électriseur", + "MAGMARIZER": "Magmariseur", + "PROTECTOR": "Protecteur", + "SACHET": "Sachet Senteur", + "WHIPPED_DREAM": "Chantibonbon", + "LEADERS_CREST": "Emblème du Général", + "SUN_FLUTE": "Flute du Soleil", + "MOON_FLUTE": "Flute de la Lune", "CHIPPED_POT": "Théière Ébréchée", "BLACK_AUGURITE": "Obsidienne", diff --git a/src/locales/it/modifier-type.json b/src/locales/it/modifier-type.json index 9edf6e5a53a..13b8a62e917 100644 --- a/src/locales/it/modifier-type.json +++ b/src/locales/it/modifier-type.json @@ -358,6 +358,10 @@ "name": "Fiammosfera", "description": "Sfera bizzarra che procura una scottatura a chi l’ha con sé in una lotta." }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "Tesori", + "description": "Questo Pokémon adora i tesori! Continua a collezionare i tesori e potrebbe accadere qualcosa!" + }, "BATON": { "name": "Staffetta", "description": "Permette di trasmettere gli effetti quando si cambia Pokémon, aggirando anche le trappole." @@ -495,6 +499,22 @@ "TART_APPLE": "Aspropomo", "STRAWBERRY_SWEET": "Bonbonfragola", "UNREMARKABLE_TEACUP": "Tazza dozzinale", + "UPGRADE": "Upgrade", + "DUBIOUS_DISC": "Dubbiodisco", + "DRAGON_SCALE": "Squama drago", + "PRISM_SCALE": "Squama bella", + "RAZOR_CLAW": "Affilartiglio", + "RAZOR_FANG": "Affilodente", + "REAPER_CLOTH": "Terrorpanno", + "ELECTIRIZER": "Elettritore", + "MAGMARIZER": "Magmatore", + "PROTECTOR": "Copertura", + "SACHET": "Bustina aromi", + "WHIPPED_DREAM": "Dolcespuma", + "LEADERS_CREST": "Simbolo del capo", + "SUN_FLUTE": "Flauto solare", + "MOON_FLUTE": "Flauto lunare", + "CHIPPED_POT": "Teiera crepata", "BLACK_AUGURITE": "Augite nera", "GALARICA_CUFF": "Fascia Galarnoce", diff --git a/src/locales/ja/modifier-type.json b/src/locales/ja/modifier-type.json index b217ab054b7..5562a25f96f 100644 --- a/src/locales/ja/modifier-type.json +++ b/src/locales/ja/modifier-type.json @@ -240,6 +240,11 @@ "TOXIC_ORB": { "name": "どくどくだま", "description": "触ると　毒をだす　不思議な玉。\n持たせると　戦闘中に　猛毒の状態に　なる" }, "FLAME_ORB": { "name": "かえんだま", "description": "触ると　熱をだす　不思議な玉。\n持たせると　戦闘中に　やけどの状態に　なる。" }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "宝物", + "description": "このポケモンは　宝物が　大好き！　宝物を　集め続けると　良いことが　起こる　かもしれません！" + }, + "BATON": { "name": "バトン", "description": "持たせると　入れ替えるとき　控えのポケモンが\n能力変化を　受けつげる　（逃げられなくする　技や　特性も　回避する）" }, "SHINY_CHARM": { "name": "ひかるおまもり", "description": "色違いの　ポケモンと　大きく　出会いやすくなる" }, @@ -330,6 +335,21 @@ "TART_APPLE": "すっぱいりんご", "STRAWBERRY_SWEET": "いちごアメざいく", "UNREMARKABLE_TEACUP": "ボンサクのちゃわん", + "UPGRADE": "アップグレード", + "DUBIOUS_DISC": "あやしいパッチ", + "DRAGON_SCALE": "りゅうのウロコ", + "PRISM_SCALE": "きれいなウロコ", + "RAZOR_CLAW": "するどいツメ", + "RAZOR_FANG": "するどいキバ", + "REAPER_CLOTH": "れいかいのぬの", + "ELECTIRIZER": "エレキブースター", + "MAGMARIZER": "マグマブースター", + "PROTECTOR": "プロテクター", + "SACHET": "においぶくろ", + "WHIPPED_DREAM": "ホイップポップ", + "LEADERS_CREST": "かしらのしるし", + "SUN_FLUTE": "たいようのふえ", + "MOON_FLUTE": "つきのふえ", "CHIPPED_POT": "かけたポット", "BLACK_AUGURITE": "くろのきせき", diff --git a/src/locales/ko/modifier-type.json b/src/locales/ko/modifier-type.json index f9d8fd1a861..d770b5fb068 100644 --- a/src/locales/ko/modifier-type.json +++ b/src/locales/ko/modifier-type.json @@ -358,9 +358,13 @@ "name": "화염구슬", "description": "이 도구를 지닌 포켓몬은 턴이 끝나는 시점에 상태이상에 걸리지 않았다면 화상 상태가 된다." }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "보물", + "description": "이 포켓몬은 보물을 좋아한다. 보물을 모으다 보면 어떤 일이 일어날 지도 모른다!" + }, "BATON": { "name": "배턴", - "description": "포켓몬을 교체할 때 효과를 넘겨줄 수 있으며, 함정의 영향을 받지 않게 함" + "description": "포켓몬을 교체할 때 효과를 넘겨줄 수 있으며, 함정의 영향을 받지 않게 한다." }, "SHINY_CHARM": { "name": "빛나는부적", @@ -495,6 +499,22 @@ "TART_APPLE": "새콤한사과", "STRAWBERRY_SWEET": "딸기사탕공예", "UNREMARKABLE_TEACUP": "범작찻잔", + "UPGRADE": "업그레이드", + "DUBIOUS_DISC": "괴상한패치", + "DRAGON_SCALE": "용의비늘", + "PRISM_SCALE": "고운비늘", + "RAZOR_CLAW": "예리한손톱", + "RAZOR_FANG": "예리한이빨", + "REAPER_CLOTH": "영계의천", + "ELECTIRIZER": "에레키부스터", + "MAGMARIZER": "마그마부스터", + "PROTECTOR": "프로텍터", + "SACHET": "향기주머니", + "WHIPPED_DREAM": "휘핑크림", + "LEADERS_CREST": "대장의징표", + "SUN_FLUTE": "태양의피리", + "MOON_FLUTE": "달의피리", + "CHIPPED_POT": "이빠진포트", "BLACK_AUGURITE": "검은휘석", "GALARICA_CUFF": "가라두구팔찌", diff --git a/src/locales/pt_BR/modifier-type.json b/src/locales/pt_BR/modifier-type.json index ae7a2cba93e..a4b27b19fb7 100644 --- a/src/locales/pt_BR/modifier-type.json +++ b/src/locales/pt_BR/modifier-type.json @@ -358,6 +358,10 @@ "name": "Esfera da Chama", "description": "Uma esfera estranha que aquece quando tocada e queima quem a segurar." }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "Treasures", + "description": "This Pokémon loves treasure! Keep collecting treasure and something might happen!" + }, "BATON": { "name": "Bastão", "description": "Permite passar mudanças de atributo ao trocar Pokémon, ignorando armadilhas." @@ -507,6 +511,22 @@ "TART_APPLE": "Maçã Azeda", "STRAWBERRY_SWEET": "Doce de Morango", "UNREMARKABLE_TEACUP": "Xícara Comum", + "UPGRADE": "Melhora", + "DUBIOUS_DISC": "Dubious Disc", + "DRAGON_SCALE": "Escama de Dragão", + "PRISM_SCALE": "Prism Scale", + "RAZOR_CLAW": "Garra de Navalha", + "RAZOR_FANG": "Presa Afiada", + "REAPER_CLOTH": "Capa do Ceifador", + "ELECTIRIZER": "Electirizer", + "MAGMARIZER": "Magmarizer", + "PROTECTOR": "Protector", + "SACHET": "Sachet", + "WHIPPED_DREAM": "Whipped Dream", + "LEADERS_CREST": "Leader's Crest", + "SUN_FLUTE": "Sun Flute", + "MOON_FLUTE": "Moon Flute", + "CHIPPED_POT": "Pote Lascado", "BLACK_AUGURITE": "Mineral Negro", "GALARICA_CUFF": "Bracelete de Galar", diff --git a/src/locales/zh_CN/modifier-type.json b/src/locales/zh_CN/modifier-type.json index 61c36078369..b02d74eadb5 100644 --- a/src/locales/zh_CN/modifier-type.json +++ b/src/locales/zh_CN/modifier-type.json @@ -358,6 +358,10 @@ "name": "火焰宝珠", "description": "触碰后会放出热量的神奇宝珠。\n携带后，在战斗时会变成灼伤状态。" }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "金子宝物", + "description": "这个小精靈爱金子! 继续挑金子然后谁知道什么会发生!" + }, "BATON": { "name": "接力棒", "description": "允许在切换宝可梦时保留能力变化, 对陷阱\n同样生效。" @@ -495,6 +499,22 @@ "TART_APPLE": "酸酸苹果", "STRAWBERRY_SWEET": "草莓糖饰", "UNREMARKABLE_TEACUP": "凡作茶碗", + "UPGRADE": "升级数据", + "DUBIOUS_DISC": "可疑补丁", + "DRAGON_SCALE": "龙之鳞片", + "PRISM_SCALE": "美丽鳞片", + "RAZOR_CLAW": "锐利之爪", + "RAZOR_FANG": "锐利之牙", + "REAPER_CLOTH": "灵界之布", + "ELECTIRIZER": "电力增幅器", + "MAGMARIZER": "熔岩增幅器", + "PROTECTOR": "护具", + "SACHET": "香袋", + "WHIPPED_DREAM": "泡沫奶油", + "LEADERS_CREST": "头领凭证", + "SUN_FLUTE": "太阳之笛", + "MOON_FLUTE": "月亮之笛", + "CHIPPED_POT": "缺损的茶壶", "BLACK_AUGURITE": "黑奇石", "GALARICA_CUFF": "伽勒豆蔻手环", diff --git a/src/locales/zh_TW/modifier-type.json b/src/locales/zh_TW/modifier-type.json index f305c0e2d62..25c79af821b 100644 --- a/src/locales/zh_TW/modifier-type.json +++ b/src/locales/zh_TW/modifier-type.json @@ -358,6 +358,10 @@ "name": "火焰寶珠", "description": "觸碰後會放出熱量的神奇寶珠。\n攜帶後，在戰鬥時會變成灼傷狀態。" }, + "EVOLUTION_TRACKER_GIMMIGHOUL": { + "name": "金子寶物", + "description": "這個小精靈愛金子! 繼續挑金子然後誰知道什麼會發生!" + }, "BATON": { "name": "接力棒", "description": "允許在切換寶可夢時保留能力變化, 對陷阱\n同樣生效。" @@ -495,6 +499,22 @@ "TART_APPLE": "酸酸蘋果", "STRAWBERRY_SWEET": "草莓糖飾", "UNREMARKABLE_TEACUP": "凡作茶碗", + "UPGRADE": "升級資料", + "DUBIOUS_DISC": "可疑修正檔", + "DRAGON_SCALE": "龍之鱗片", + "PRISM_SCALE": "美麗鱗片", + "RAZOR_CLAW": "銳利之爪", + "RAZOR_FANG": "銳利之牙", + "REAPER_CLOTH": "靈界之布", + "ELECTIRIZER": "電力增幅器", + "MAGMARIZER": "熔岩增幅器", + "PROTECTOR": "護具", + "SACHET": "香袋", + "WHIPPED_DREAM": "泡沫奶油", + "LEADERS_CREST": "頭領憑證", + "SUN_FLUTE": "太陽之笛", + "MOON_FLUTE": "月亮之笛", + "CHIPPED_POT": "缺損的茶壺", "BLACK_AUGURITE": "黑奇石", "GALARICA_CUFF": "伽勒豆蔻手環", From 1a19065a45e29f166dc29886715a9e9f174573b9 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Fri, 27 Sep 2024 16:57:46 -0400 Subject: [PATCH 2/3] [Bug] [Balance] Gimmighoul evolution adjustments/fixes (#4463) * Fix Gimmighoul evolution * Fix counter * Less janky maxStack check --------- Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/data/pokemon-evolutions.ts | 5 +++-- src/modifier/modifier.ts | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index f9602d1386a..a262b84b18a 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -11,6 +11,7 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TimeOfDay } from "#enums/time-of-day"; +import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier } from "#app/modifier/modifier"; export enum SpeciesWildEvolutionDelay { NONE, @@ -1647,8 +1648,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 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.VERY_LONG) + new SpeciesFormEvolution(Species.GHOLDENGO, "chest", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 - p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length ), SpeciesWildEvolutionDelay.VERY_LONG), + new SpeciesFormEvolution(Species.GHOLDENGO, "roaming", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 - p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length ), SpeciesWildEvolutionDelay.VERY_LONG) ] }; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index cf9cf78225e..0a683ca8d27 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -859,7 +859,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { } clone(): PersistentModifier { - return new EvoTrackerModifier(this.type, this.pokemonId, this.species, this.stackCount); + return new EvoTrackerModifier(this.type, this.pokemonId, this.species, this.required, this.stackCount); } getArgs(): any[] { @@ -870,8 +870,9 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(_pokemon: Pokemon): integer { - return this.required; + getMaxHeldItemCount(pokemon: Pokemon): integer { + this.stackCount = pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length + pokemon.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length; + return this.stackCount < this.required ? this.required : this.stackCount + 1; } } From 4364ab36b9c1af8c6cec8b5e8bc470f237c06eac Mon Sep 17 00:00:00 2001 From: Xavion3 Date: Sat, 28 Sep 2024 07:35:26 +1000 Subject: [PATCH 3/3] Revert "[Bug] [Balance] Gimmighoul evolution adjustments/fixes (#4463)" (#4472) This reverts commit 1a19065a45e29f166dc29886715a9e9f174573b9. --- src/data/pokemon-evolutions.ts | 5 ++--- src/modifier/modifier.ts | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index a262b84b18a..f9602d1386a 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -11,7 +11,6 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TimeOfDay } from "#enums/time-of-day"; -import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier } from "#app/modifier/modifier"; export enum SpeciesWildEvolutionDelay { NONE, @@ -1648,8 +1647,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 SpeciesFormEvolution(Species.GHOLDENGO, "chest", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 - p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length ), SpeciesWildEvolutionDelay.VERY_LONG), - new SpeciesFormEvolution(Species.GHOLDENGO, "roaming", "", 1, null, new SpeciesEvolutionCondition( p => p.evoCounter > 9 - p.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length - p.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length ), 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.VERY_LONG) ] }; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 0a683ca8d27..cf9cf78225e 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -859,7 +859,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { } clone(): PersistentModifier { - return new EvoTrackerModifier(this.type, this.pokemonId, this.species, this.required, this.stackCount); + return new EvoTrackerModifier(this.type, this.pokemonId, this.species, this.stackCount); } getArgs(): any[] { @@ -870,9 +870,8 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier { return true; } - getMaxHeldItemCount(pokemon: Pokemon): integer { - this.stackCount = pokemon.evoCounter + pokemon.getHeldItems().filter(m => m instanceof DamageMoneyRewardModifier).length + pokemon.scene.findModifiers(m => m instanceof MoneyMultiplierModifier || m instanceof ExtraModifierModifier).length; - return this.stackCount < this.required ? this.required : this.stackCount + 1; + getMaxHeldItemCount(_pokemon: Pokemon): integer { + return this.required; } }