ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some issues with prompt timeouts

This commit is contained in:
snoozbuster 2024-08-13 21:10:12 -07:00
parent 1b7ccb1912
commit daebb3a91c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/utils/phaseInterceptor.ts
View File

@ -322,10 +322,10 @@ export default class PhaseInterceptor {
* Method to start the prompt handler. * Method to start the prompt handler.
*/ */
startPromptHandler() { startPromptHandler() {
const PROMPT_TIMEOUT = 1000; const PROMPT_TIMEOUT = 2000;
let timeSpentInPrompt = 0; let timeSpentInPrompt = 0;
let lastTime = Date.now(); let lastTime: number | undefined = undefined;
let lastPhase, lastPromptPhase, lastMode; let lastPhase, lastPromptPhase, lastMode;
let warned = false; let warned = false;
@ -337,9 +337,9 @@ export default class PhaseInterceptor {
const currentPhase = this.scene.getCurrentPhase().constructor.name; const currentPhase = this.scene.getCurrentPhase().constructor.name;
const currentHandler = this.scene.ui.getHandler(); const currentHandler = this.scene.ui.getHandler();
if (lastPhase === currentPhase && lastPromptPhase === actionForNextPrompt.phaseTarget && lastMode === currentMode) { if (lastPhase === currentPhase && lastPromptPhase === actionForNextPrompt.phaseTarget && lastMode === currentMode && currentMode !== Mode.MESSAGE) {
const currentTime = Date.now(); const currentTime = Date.now();
timeSpentInPrompt += currentTime - lastTime; timeSpentInPrompt += lastTime === undefined ? 0 : currentTime - lastTime;
lastTime = currentTime; lastTime = currentTime;
if (timeSpentInPrompt > PROMPT_TIMEOUT && !warned) { if (timeSpentInPrompt > PROMPT_TIMEOUT && !warned) {
@ -358,8 +358,12 @@ export default class PhaseInterceptor {
if (expireFn) { if (expireFn) {
this.prompts.shift(); this.prompts.shift();
console.log(`Prompt for ${actionForNextPrompt.phaseTarget} (mode ${actionForNextPrompt.mode}) has expired`); console.log(`Prompt for ${actionForNextPrompt.phaseTarget} (mode ${actionForNextPrompt.mode}) has expired`);
timeSpentInPrompt = 0;
lastTime = undefined;
} else if (currentMode === actionForNextPrompt.mode && currentPhase === actionForNextPrompt.phaseTarget && currentHandler.active && (!actionForNextPrompt.awaitingActionInput || (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput))) { } else if (currentMode === actionForNextPrompt.mode && currentPhase === actionForNextPrompt.phaseTarget && currentHandler.active && (!actionForNextPrompt.awaitingActionInput || (actionForNextPrompt.awaitingActionInput && currentHandler.awaitingActionInput))) {
console.log(`Prompt for ${actionForNextPrompt.phaseTarget} (mode ${actionForNextPrompt.mode}) has triggered`); console.log(`Prompt for ${actionForNextPrompt.phaseTarget} (mode ${actionForNextPrompt.mode}) has triggered`);
timeSpentInPrompt = 0;
lastTime = undefined;
this.prompts.shift().callback(); this.prompts.shift().callback();
} }
} }