mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-23 15:03:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up bangs

Browse Source
This commit is contained in:
Xavion3 2025-09-02 06:37:25 +10:00
parent eb8c0c0243
commit bc0e2662fa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/field/pokemon.ts
View File

@ -4555,7 +4555,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
} }
let duration = cry.totalDuration * 1000; let duration = cry.totalDuration * 1000;
if (this.fusionSpecies && this.getSpeciesForm(undefined, true) !== this.getFusionSpeciesForm(undefined, true)) { if (this.fusionSpecies && this.getSpeciesForm(undefined, true) !== this.getFusionSpeciesForm(undefined, true)) {
let fusionCry = this.getFusionSpeciesForm(undefined, true).cry(soundConfig, true); const fusionCry = this.getFusionSpeciesForm(undefined, true).cry(soundConfig, true);
if (!fusionCry) { if (!fusionCry) {
return cry; return cry;
} }
@ -4564,15 +4564,14 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
scene.time.delayedCall(fixedInt(Math.ceil(duration * 0.4)), () => { scene.time.delayedCall(fixedInt(Math.ceil(duration * 0.4)), () => {
try { try {
SoundFade.fadeOut(scene, cry, fixedInt(Math.ceil(duration * 0.2))); SoundFade.fadeOut(scene, cry, fixedInt(Math.ceil(duration * 0.2)));
fusionCry = this.getFusionSpeciesForm(undefined, true).cry({ const fusionCryInner = this.getFusionSpeciesForm(undefined, true).cry({
// Typescript's type checker doesn't handle using and assigning to the same variable in one line correctly. seek: Math.max(fusionCry.totalDuration * 0.4, 0),
seek: Math.max(fusionCry!.totalDuration * 0.4, 0),
...soundConfig, ...soundConfig,
}); });
if (fusionCry) { if (fusionCryInner) {
SoundFade.fadeIn( SoundFade.fadeIn(
scene, scene,
fusionCry, fusionCryInner,
fixedInt(Math.ceil(duration * 0.2)), fixedInt(Math.ceil(duration * 0.2)),
scene.masterVolume * scene.fieldVolume, scene.masterVolume * scene.fieldVolume,
0, 0,
@ -4721,6 +4720,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
if (i === transitionIndex && fusionCryKey) { if (i === transitionIndex && fusionCryKey) {
SoundFade.fadeOut(globalScene, cry, fixedInt(Math.ceil((duration / rate) * 0.2))); SoundFade.fadeOut(globalScene, cry, fixedInt(Math.ceil((duration / rate) * 0.2)));
fusionCry = globalScene.playSound(fusionCryKey, { fusionCry = globalScene.playSound(fusionCryKey, {
// TODO: This bang is correct as this callback can only be called once, but
// this whole block with conditionally reassigning fusionCry needs a second lock.
seek: Math.max(fusionCry!.totalDuration * 0.4, 0), seek: Math.max(fusionCry!.totalDuration * 0.4, 0),
rate: rate, rate: rate,
}); });