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

Update Eternatus' moveset

pull/14/head
Flashfyre 2023-12-16 00:46:01 -05:00
parent 4062cd9380
commit d8c62b700f
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/egg-hatch-phase.ts
View File

@ -71,9 +71,8 @@ export class EggHatchPhase extends BattlePhase {
this.scene.fieldUI.add(this.eggHatchOverlay); this.scene.fieldUI.add(this.eggHatchOverlay);
const pokemon = this.generatePokemon(); const pokemon = this.generatePokemon();
const preName = pokemon.name;
console.log(preName, pokemon); console.log(pokemon.name, pokemon);
this.pokemonSprite.setVisible(false); this.pokemonSprite.setVisible(false);
@ -112,15 +111,23 @@ export class EggHatchPhase extends BattlePhase {
this.eggContainer.setVisible(false); this.eggContainer.setVisible(false);
this.pokemonSprite.play(pokemon.getSpriteKey(true)); this.pokemonSprite.play(pokemon.getSpriteKey(true));
this.pokemonSprite.setVisible(true); this.pokemonSprite.setVisible(true);
this.scene.time.delayedCall(Utils.fixedInt(1000), () => pokemon.cry()); this.scene.time.delayedCall(Utils.fixedInt(1000), () => {
pokemon.cry();
this.scene.time.delayedCall(Utils.fixedInt(1250), () => {
this.scene.playSoundWithoutBgm('evolution_fanfare');
this.scene.ui.showText(`${pokemon.name} hatched from the egg!`, null, () => {
this.scene.ui.showText(null, 0);
this.end();
}, null, true, 3000);
this.scene.time.delayedCall(Utils.fixedInt(4250), () => this.scene.playBgm());
});
});
this.scene.tweens.add({ this.scene.tweens.add({
duration: Utils.fixedInt(3000), duration: Utils.fixedInt(3000),
targets: this.eggHatchOverlay, targets: this.eggHatchOverlay,
alpha: 0, alpha: 0,
ease: 'Cubic.easeOut', ease: 'Cubic.easeOut'
onComplete: () => {
this.scene.time.delayedCall(1000, () => this.end());
}
}); });
}); });
}); });

19
src/pokemon.ts
View File

@ -1853,12 +1853,19 @@ export class EnemyPokemon extends Pokemon {
generateAndPopulateMoveset(): void { generateAndPopulateMoveset(): void {
switch (true) { switch (true) {
case (this.species.speciesId === Species.ETERNATUS): case (this.species.speciesId === Species.ETERNATUS):
this.moveset = [ this.moveset = this.formIndex
new PokemonMove(Moves.DYNAMAX_CANNON), ? [
new PokemonMove(Moves.CROSS_POISON), new PokemonMove(Moves.DYNAMAX_CANNON),
new PokemonMove(Moves.DRAGON_DANCE), new PokemonMove(Moves.SLUDGE_BOMB),
new PokemonMove(Moves.RECOVER) new PokemonMove(Moves.FLAMETHROWER),
]; new PokemonMove(Moves.RECOVER)
]
: [
new PokemonMove(Moves.ETERNABEAM),
new PokemonMove(Moves.CROSS_POISON),
new PokemonMove(Moves.DRAGON_DANCE),
new PokemonMove(Moves.RECOVER)
];
break; break;
default: default:
super.generateAndPopulateMoveset(); super.generateAndPopulateMoveset();