mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-07 17:02:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing the exp bug

Browse Source
This commit is contained in:
PrabbyDD 2024-10-18 13:37:49 -07:00
parent e7a4d4055f
commit a9affe29c7
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle-scene.ts
View File

@ -3038,6 +3038,7 @@ export default class BattleScene extends SceneBase {
const expPartyMembers = nonFaintedPartyMembers.filter(p => p.level < this.getMaxExpLevel());
const partyMemberExp: number[] = [];
// EXP value calculation is based off Pokemon.getExpValue
console.log("PARTIPADOS", this.currentBattle.playerParticipantIds);
if (useWaveIndexMultiplier) {
expValue = Math.floor(expValue * this.currentBattle.waveIndex / 5 + 1);
}
@ -3116,6 +3117,14 @@ export default class BattleScene extends SceneBase {
if (exp) {
const partyMemberIndex = party.indexOf(expPartyMembers[pm]);
// Maybe here?
/*
I think that this hyper specific bug is because initally, the pokemon being switched in right before opposing pokemons death is not counted as participant,
and not in the expPartyMembers maybe?
in the other cause where I switched both in but swapped last second before toxic death, then both had already been involved in fight
*/
this.unshiftPhase(expPartyMembers[pm].isOnField() ? new ExpPhase(this, partyMemberIndex, exp) : new ShowPartyExpBarPhase(this, partyMemberIndex, exp));
}
}

10
src/phases/faint-phase.ts
View File

@ -44,6 +44,16 @@ export class FaintPhase extends PokemonPhase {
}
}
/** In case the current pokemon was just switched in, make sure it is counted as participating in the combat */
this.scene.getField().forEach((pokemon, i) => {
if (pokemon?.isActive()) {
if (pokemon.isPlayer()) {
this.scene.currentBattle.addParticipant(pokemon as PlayerPokemon);
}
pokemon.resetTurnData();
}
});
if (!this.tryOverrideForBattleSpec()) {
this.doFaint();
}