mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-26 17:29:30 +02:00
Debug Items
gave the shiny new stuff assets so I don't have to look at invalid sprites lol
This commit is contained in:
parent
e550c71928
commit
c254aa15e9
@ -7946,6 +7946,48 @@
|
|||||||
"w": 16,
|
"w": 16,
|
||||||
"h": 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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 133 KiB |
@ -54,7 +54,7 @@ export enum EvolutionItem {
|
|||||||
SYRUPY_APPLE,
|
SYRUPY_APPLE,
|
||||||
|
|
||||||
SUPER_EVO_ITEM,
|
SUPER_EVO_ITEM,
|
||||||
SUPER_EVO_ITEM_F
|
SUPER_EVO_ITEM_FUSION
|
||||||
}
|
}
|
||||||
|
|
||||||
export type EvolutionConditionPredicate = (p: Pokemon) => boolean;
|
export type EvolutionConditionPredicate = (p: Pokemon) => boolean;
|
||||||
|
@ -329,6 +329,9 @@ export const modifierType: ModifierTypeTranslationEntries = {
|
|||||||
"SCROLL_OF_DARKNESS": "Scroll Of Darkness",
|
"SCROLL_OF_DARKNESS": "Scroll Of Darkness",
|
||||||
"SCROLL_OF_WATERS": "Scroll Of Waters",
|
"SCROLL_OF_WATERS": "Scroll Of Waters",
|
||||||
"SYRUPY_APPLE": "Syrupy Apple",
|
"SYRUPY_APPLE": "Syrupy Apple",
|
||||||
|
|
||||||
|
"SUPER_EVO_ITEM": "Evolve Pokémon",
|
||||||
|
"SUPER_EVO_ITEM_FUSION": "Evolve Fusion",
|
||||||
},
|
},
|
||||||
FormChangeItem: {
|
FormChangeItem: {
|
||||||
"NONE": "None",
|
"NONE": "None",
|
||||||
|
@ -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)
|
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)) {
|
&& (!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;
|
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)
|
} 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_F)).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX || this.evolutionItem === EvolutionItem.SUPER_EVO_ITEM_F)) {
|
&& (!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;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1319,7 +1319,7 @@ export const modifierTypes = {
|
|||||||
RARE_EVOLUTION_ITEM: () => new EvolutionItemModifierTypeGenerator(true),
|
RARE_EVOLUTION_ITEM: () => new EvolutionItemModifierTypeGenerator(true),
|
||||||
FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(),
|
FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(),
|
||||||
FORCE_EVOLVE_ITEM: () => new EvolutionItemModifierType(EvolutionItem.SUPER_EVO_ITEM),
|
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)),
|
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)),
|
DYNAMAX_BAND: () => new ModifierType("modifierType:ModifierType.DYNAMAX_BAND", "dynamax_band", (type, _args) => new Modifiers.GigantamaxAccessModifier(type)),
|
||||||
|
Loading…
Reference in New Issue
Block a user