GuillaumeHemmen/pokemon-js
1
0
Fork 0
mirror of https://github.com/chase-manning/pokemon-js.git synced 2025-08-06 18:59:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 not exiting trainer battles

Browse source
This commit is contained in:
Chase Manning 2023-10-13 08:30:31 +01:00
commit 548d66d3fd
1 changed files with 9 additions and 2 deletions

11
src/components/PokemonEncounter.tsx
View file

@ -611,7 +611,14 @@ const PokemonEncounter = () => {
const isTrainer = !!trainer;
const isThrowingEnemyPokeball = stage >= 34 && stage <= 38 && isTrainer;
const endEncounter_ = () => {
const endEncounter_ = (exitBattle = false) => {
if (exitBattle) {
setTrainerPokemonIndex(0);
dispatch(endEncounter());
dispatch(faintToTrainer());
return;
}
// Bringing out the trainers next pokemon
if (isTrainer && trainerPokemonIndex < trainer?.pokemon.length - 1) {
const newIndex = trainerPokemonIndex + 1;
@ -896,7 +903,7 @@ const PokemonEncounter = () => {
dispatch(recoverFromFainting());
}, 1000);
setTimeout(() => {
endEncounter_();
endEncounter_(true);
}, 1000 + 500);
}