diff --git a/public/images/items.json b/public/images/items.json index 33dcf8f5e9a..01c75d9ef8d 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -7946,6 +7946,48 @@ "w": 16, "h": 16 } + }, + { + "filename": "super_evo_item", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 379, + "y": 397, + "w": 16, + "h": 16 + } + }, + { + "filename": "super_evo_item_fusion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 8, + "w": 16, + "h": 16 + }, + "frame": { + "x": 397, + "y": 397, + "w": 16, + "h": 16 + } } ] } diff --git a/public/images/items.png b/public/images/items.png index 6d9434d0454..df23c8dbec0 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index c66fbb1d8ae..8c0d56e25a1 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -54,7 +54,7 @@ export enum EvolutionItem { SYRUPY_APPLE, SUPER_EVO_ITEM, - SUPER_EVO_ITEM_F + SUPER_EVO_ITEM_FUSION } export type EvolutionConditionPredicate = (p: Pokemon) => boolean; diff --git a/src/locales/en/modifier-type.ts b/src/locales/en/modifier-type.ts index 7bbf89388c4..e86552d6fff 100644 --- a/src/locales/en/modifier-type.ts +++ b/src/locales/en/modifier-type.ts @@ -329,6 +329,9 @@ export const modifierType: ModifierTypeTranslationEntries = { "SCROLL_OF_DARKNESS": "Scroll Of Darkness", "SCROLL_OF_WATERS": "Scroll Of Waters", "SYRUPY_APPLE": "Syrupy Apple", + + "SUPER_EVO_ITEM": "Evolve Pokémon", + "SUPER_EVO_ITEM_FUSION": "Evolve Fusion", }, FormChangeItem: { "NONE": "None", diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index a8baa5c5ace..1fc9ae89326 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -898,8 +898,8 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => (e.item === this.evolutionItem || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM) && (!e.condition || e.condition.predicate(pokemon) || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM)).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM)) { return null; - } else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => (e.item === this.evolutionItem || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_F) - && (!e.condition || e.condition.predicate(pokemon) || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_F)).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_F)) { + } else if (pokemon.isFusion() && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => (e.item === this.evolutionItem || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_FUSION) + && (!e.condition || e.condition.predicate(pokemon) || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_FUSION)).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_FUSION)) { return null; } @@ -1319,7 +1319,7 @@ export const modifierTypes = { RARE_EVOLUTION_ITEM: () => new EvolutionItemModifierTypeGenerator(true), FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(), FORCE_EVOLVE_ITEM: () => new EvolutionItemModifierType(EvolutionItem.SUPER_EVO_ITEM), - FORCE_FUSE_EVOLVE_ITEM: () => new EvolutionItemModifierType(EvolutionItem.SUPER_EVO_ITEM_F), + FORCE_FUSE_EVOLVE_ITEM: () => new EvolutionItemModifierType(EvolutionItem.SUPER_EVO_ITEM_FUSION), MEGA_BRACELET: () => new ModifierType("modifierType:ModifierType.MEGA_BRACELET", "mega_bracelet", (type, _args) => new Modifiers.MegaEvolutionAccessModifier(type)), DYNAMAX_BAND: () => new ModifierType("modifierType:ModifierType.DYNAMAX_BAND", "dynamax_band", (type, _args) => new Modifiers.GigantamaxAccessModifier(type)),