Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Guangcong Luo 2025-05-24 12:16:03 -07:00
parent 74f0472bb7
commit 16e8dc45bd
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/room-battle.ts
View File

@ -267,10 +267,26 @@ export class RoomBattleTimer {
}
updateTurn() {
if (this.turn === null) {
// first request since timer was turned on
this.turn = this.battle.turn;
return true;
return;
}
if (this.battle.turn <= this.turn) return false;
if (this.battle.turn <= this.turn) {
if (this.battle.players.filter(p => !p.request.isWait).length <= 1) {
// first request of a mid-turn request (U-turn or faint-switch)
this.isFirstRequest = false;
const addPerMidTurnRequest = Math.min(this.settings.addPerTurn, TICK_TIME);
this.battle.room.add(`||adding ${addPerMidTurnRequest} to each for mid turn request`);
for (const curPlayer of this.battle.players) {
curPlayer.secondsLeft += addPerMidTurnRequest;
}
} else {
// second player of a request we've already updated the timer for
}
return;
}
// new turn
this.turn = this.battle.turn;
this.isFirstRequest = false;
@ -290,7 +306,6 @@ export class RoomBattleTimer {
for (const player of this.battle.players) {
player.secondsLeft = Math.min(player.secondsLeft + addPerTurn, this.settings.starting);
}
return true;
}
nextRequest(player: RoomBattlePlayer) {
if (player.secondsLeft <= 0) return;
@ -305,17 +320,7 @@ export class RoomBattleTimer {
if (this.battle.players.filter(p => p.secondsLeft > 0).length <= 1) return;
const room = this.battle.room;
if (!this.updateTurn()) {
if (this.battle.players.filter(p => !p.request.isWait).length <= 1) {
this.isFirstRequest = false;
// first request of a mid-turn request (U-turn or faint-switch)
const addPerMidTurnRequest = Math.min(this.settings.addPerTurn, TICK_TIME);
room.add(`||adding ${addPerMidTurnRequest} to each for mid turn request`);
for (const curPlayer of this.battle.players) {
curPlayer.secondsLeft += addPerMidTurnRequest;
}
}
}
this.updateTurn();
const maxTurnTime = (this.isFirstRequest ? this.settings.maxFirstTurn : 0) || this.settings.maxPerTurn;
player.turnSecondsLeft = Math.min(player.secondsLeft, maxTurnTime);