GuillaumeHemmen/pokemon-js
1
0
Fork 0
mirror of https://github.com/chase-manning/pokemon-js.git synced 2025-08-26 03:07:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 able to encounter trainers twice

Browse source
This commit is contained in:
Chase Manning 2023-10-12 15:37:08 +01:00
commit 060b6d97e4
1 changed files with 6 additions and 0 deletions

6
src/components/TrainerEncounter.tsx
View file

@ -21,6 +21,7 @@ import Frame from "./Frame";
import useEvent from "../app/use-event"; import useEvent from "../app/use-event";
import { Event } from "../app/emitter"; import { Event } from "../app/emitter";
import getPokemonEncounter from "../app/pokemon-encounter-helper"; import getPokemonEncounter from "../app/pokemon-encounter-helper";
import { showText } from "../state/uiSlice";
const StyledTrainerEncounter = styled.div` const StyledTrainerEncounter = styled.div`
position: absolute; position: absolute;
@ -81,6 +82,11 @@ const TrainerEncounter = () => {
trainer.pos.y === pos.y + facingPos.y trainer.pos.y === pos.y + facingPos.y
); );
if (!trainer) throw new Error("Trainer not found"); if (!trainer) throw new Error("Trainer not found");
const trainerId = `${mapId}-${trainer.pos.x}-${trainer.pos.y}`;
if (defeatedTrainers.includes(trainerId)) {
dispatch(showText(trainer.outtro));
return;
}
dispatch(encounterTrainer(trainer)); dispatch(encounterTrainer(trainer));
setTimeout(() => { setTimeout(() => {
setIntroIndex(0); setIntroIndex(0);