IAmChrisAMA/pokerogue
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash with Deoxys normal forme sprite

Browse Source
This commit is contained in:
Flashfyre committed 2023-12-15 23:21:42 -05:00
1 parent 71fdafe8fb
commit 5ad16731db
4 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

public/images/pokemon/386-normal.json → public/images/pokemon/386.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"textures": [
{
"image": "386-normal.png",
"image": "386.png",
"format": "RGBA8888",
"size": {
"w": 306,
public/images/pokemon/386-normal.png → public/images/pokemon/386.png
View File
File renamed without changes.
src/data/pokemon-species.ts
+1 -1
View File
@@ -1017,7 +1017,7 @@ export function initSpecies() {
),
new PokemonSpecies(Species.JIRACHI, "Jirachi", 3, false, false, true, "Wish Pokémon", Type.STEEL, Type.PSYCHIC, 0.3, 1.1, Abilities.SERENE_GRACE, Abilities.NONE, Abilities.NONE, 600, 100, 100, 100, 100, 100, 100, 3, 100, 300, GrowthRate.SLOW, null, false),
new PokemonSpecies(Species.DEOXYS, "Deoxys", 3, false, false, true, "DNA Pokémon", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 270, GrowthRate.SLOW, null, false, true,
new PokemonForm("Normal Forme", "", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 270),
new PokemonForm("Normal Forme", "normal", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 150, 50, 150, 50, 150, 3, 0, 270, ""),
new PokemonForm("Attack Forme", "attack", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 180, 20, 180, 20, 150, 3, 0, 270),
new PokemonForm("Defense Forme", "defense", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 70, 160, 70, 160, 90, 3, 0, 270),
new PokemonForm("Speed Forme", "speed", Type.PSYCHIC, null, 1.7, 60.8, Abilities.PRESSURE, Abilities.NONE, Abilities.NONE, 600, 50, 95, 90, 95, 90, 180, 3, 0, 270),
src/egg-hatch-phase.ts
+6 -6
View File
@@ -97,24 +97,24 @@ export class EggHatchPhase extends BattlePhase {
this.eggCrackSprite.setFrame('3');
this.scene.time.delayedCall(125, () => this.eggCrackSprite.setFrame('4'));
this.doEggShake(8, 2).then(() => {
SoundFade.fadeOut(this.scene, evolutionBgm, 100);
SoundFade.fadeOut(this.scene, evolutionBgm, Utils.fixedInt(100));
for (let e = 0; e < 5; e++)
this.scene.time.delayedCall(375 * e, () => this.scene.playSound('egg_hatch', { volume: 1 - (e * 0.2) }));
this.scene.time.delayedCall(Utils.fixedInt(375 * e), () => this.scene.playSound('egg_hatch', { volume: 1 - (e * 0.2) }));
this.eggLightraysOverlay.setVisible(true);
this.eggLightraysOverlay.play('egg_lightrays');
this.scene.tweens.add({
duration: 125,
duration: Utils.fixedInt(125),
targets: this.eggHatchOverlay,
alpha: 1,
ease: 'Cubic.easeIn'
});
this.scene.time.delayedCall(1500, () => {
this.scene.time.delayedCall(Utils.fixedInt(1500), () => {
this.eggContainer.setVisible(false);
this.pokemonSprite.play(pokemon.getSpriteKey(true));
this.pokemonSprite.setVisible(true);
this.scene.time.delayedCall(1000, () => pokemon.cry());
this.scene.time.delayedCall(Utils.fixedInt(1000), () => pokemon.cry());
this.scene.tweens.add({
duration: 3000,
duration: Utils.fixedInt(3000),
targets: this.eggHatchOverlay,
alpha: 0,
ease: 'Cubic.easeOut',