[Hotfix] Retrieve the right cry when alternate-form Pokemon faint + retrieve the correct sprite key (#4117)
* [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain * fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> * Fusion hotfix * returned main * Faint cry properly retrieved for non fused Pokemon with forms * Revert "[DOCS] adding JSDocs to `arena.ts` (#3590)" This reverts commitb73fd97760
. * Revert "[Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067)" This reverts commit31fcbf49f4
. * Revert "fix and optimize imports (#4061)" This reverts commitd1bd6974e4
. * Fixed sprite key generation --------- Co-authored-by: DustinLin <39450497+DustinLin@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: frutescens <info@laptop>
This commit is contained in:
parent
22c60ab532
commit
021f31b589
|
@ -2763,8 +2763,8 @@ export default class BattleScene extends SceneBase {
|
||||||
const keys: string[] = [];
|
const keys: string[] = [];
|
||||||
const playerParty = this.getParty();
|
const playerParty = this.getParty();
|
||||||
playerParty.forEach(p => {
|
playerParty.forEach(p => {
|
||||||
keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant));
|
keys.push(p.getSpriteKey(true));
|
||||||
keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant, true));
|
keys.push(p.getBattleSpriteKey(true, true));
|
||||||
keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
|
keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
|
||||||
if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
|
if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
|
||||||
keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
|
keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
|
||||||
|
@ -2773,7 +2773,7 @@ export default class BattleScene extends SceneBase {
|
||||||
// enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon
|
// enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon
|
||||||
const enemyParty = this.getEnemyParty();
|
const enemyParty = this.getEnemyParty();
|
||||||
enemyParty.forEach(p => {
|
enemyParty.forEach(p => {
|
||||||
keys.push(p.species.getSpriteKey(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant));
|
keys.push(p.getSpriteKey(true));
|
||||||
keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
|
keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
|
||||||
if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
|
if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
|
||||||
keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
|
keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
|
||||||
|
|
|
@ -2771,7 +2771,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||||
return this.fusionFaintCry(callback);
|
return this.fusionFaintCry(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`;
|
const key = `cry/${this.species.getCryKey(this.formIndex)}`;
|
||||||
//eslint-disable-next-line @typescript-eslint/no-unused-vars
|
//eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
let i = 0;
|
let i = 0;
|
||||||
let rate = 0.85;
|
let rate = 0.85;
|
||||||
|
|
Loading…
Reference in New Issue