Fix CPU fight round, KO and match end flow

js/port.js

@@ -99,10 +99,15 @@ function parseCommands(text) {
 }
 
 function startMatch() {
+  const p1 = new Fighter(assets, -72, 1, '#c84b39', true);
+  const p2 = new Fighter(assets, 72, -1, '#3159a4');
+  p1.name = 'CPU 1 · KFM'; p2.name = 'CPU 2 · KFM';
   game = {
-    p1: new Fighter(assets, -72, 1, '#c84b39', true), p2: new Fighter(assets, 72, -1, '#3159a4'),
-    tick: 0, time: 99 * 60, round: 'ROUND 1', roundLeft: 80, shake: 0,
+    p1, p2,
+    tick: 0, time: 99, roundFrames: 99 * 60, round: 'ROUND 1', phase: 'intro', phaseTicks: 75,
+    roundNo: 1, roundsToWin: 2, shake: 0,
   };
+  game.p1.resetMatch(); game.p2.resetMatch();
   window.game = game;
 }
 
@@ -124,16 +129,57 @@ document.querySelector('#restart').onclick = () => startMatch();
 function step() {
   if (!game) return;
   game.tick++;
-  if (game.roundLeft > 0) game.roundLeft--;
-  else if (game.p1.life > 0 && game.p2.life > 0) game.roundLeft = 20;
-  if (game.roundLeft === 20) game.round = 'FIGHT!';
-  if (game.roundLeft <= 20) {
-    if (game.roundLeft === 0) game.round = '';
+  if (game.phase === 'intro') {
+    if (--game.phaseTicks === 25) game.round = 'FIGHT!';
+    if (game.phaseTicks <= 0) { game.phase = 'fight'; game.round = ''; }
+    return;
+  }
+  if (game.phase === 'fight') {
     game.p1.update(null, game.p2, game);
     game.p2.update(null, game.p1, game);
     resolveCollisions(game.p1, game.p2, game);
-    if (game.p1.life <= 0 || game.p2.life <= 0) game.round = game.p1.life > game.p2.life ? 'KUNG FU MAN WINS' : 'K.O.';
+    if (game.p1.life <= 0 || game.p2.life <= 0) {
+      const winner = game.p1.life === game.p2.life ? null : game.p1.life > game.p2.life ? game.p1 : game.p2;
+      finishRound(winner, 'K.O.');
+    } else if (--game.roundFrames <= 0) {
+      const winner = game.p1.life === game.p2.life ? null : game.p1.life > game.p2.life ? game.p1 : game.p2;
+      finishRound(winner, 'TIME OVER');
+    }
+    game.time = Math.ceil(Math.max(0, game.roundFrames) / 60);
+    return;
+  }
+  if (game.phaseTicks > 0) { game.phaseTicks--; return; }
+  if (game.phase === 'roundEnd') {
+    const winner = [game.p1, game.p2].find(f => f.roundsWon >= game.roundsToWin);
+    if (winner) {
+      game.phase = 'matchEnd'; game.phaseTicks = 240;
+      game.round = `${winner.name} WINS THE MATCH`;
+    } else {
+      game.roundNo++;
+      game.p1.resetRound(); game.p2.resetRound();
+      game.round = `ROUND ${game.roundNo}`; game.roundFrames = 99 * 60; game.time = 99;
+      game.phase = 'intro'; game.phaseTicks = 75;
+    }
+    return;
   }
+  if (game.phase === 'matchEnd') {
+    game.p1.resetMatch(); game.p2.resetMatch();
+    game.p1.x = -72; game.p2.x = 72; game.p1.facing = 1; game.p2.facing = -1;
+    game.p1.name = 'CPU 1 · KFM'; game.p2.name = 'CPU 2 · KFM';
+    game.roundNo = 1; game.roundFrames = 99 * 60; game.time = 99;
+    game.round = 'ROUND 1'; game.phase = 'intro'; game.phaseTicks = 75;
+  }
+}
+
+function finishRound(winner, result) {
+  if (game.phase !== 'fight') return;
+  if (winner) winner.roundsWon++;
+  const loser = winner ? (winner === game.p1 ? game.p2 : game.p1) : null;
+  if (winner) winner.setAction(181, 181);
+  if (loser) loser.setAction(5151, 5151);
+  if (!winner) { game.p1.setAction(5151, 5151); game.p2.setAction(5151, 5151); }
+  game.phase = 'roundEnd'; game.phaseTicks = 135;
+  game.round = winner ? `${winner === game.p1 ? 'KUNG FU MAN' : 'CPU'} WINS` : `DRAW · ${result}`;
 }
 
 function worldBoxes(f, boxes) {
@@ -239,8 +285,12 @@ function drawHud(w, h) {
     const fill = 156 * Math.max(0, f.life / f.maxLife); ctx.fillStyle = col; ctx.fillRect(mirror ? x + 158 - fill : x + 2, 10, fill, 7);
     ctx.fillStyle = '#f6f1df'; ctx.font = 'bold 9px system-ui'; ctx.fillText(f.name, x, 31);
   }
-  ctx.textAlign = 'center'; ctx.fillStyle = '#fff6d8'; ctx.font = 'bold 21px ui-monospace'; ctx.fillText(String(Math.ceil(game.time / 60)).padStart(2, '0'), unitW / 2, 25);
-  if (game.roundLeft > 0 && game.round !== 'FIGHT!') { ctx.font = 'bold 21px system-ui'; ctx.fillText(game.round, unitW / 2, 82); }
+  ctx.textAlign = 'center'; ctx.fillStyle = '#fff6d8'; ctx.font = 'bold 21px ui-monospace'; ctx.fillText(String(game.time).padStart(2, '0'), unitW / 2, 25);
+  for (let n = 0; n < game.roundsToWin; n++) {
+    ctx.fillStyle = n < game.p1.roundsWon ? '#ffd36a' : '#59636d'; ctx.beginPath(); ctx.arc(10 + n * 14, 39, 4, 0, Math.PI * 2); ctx.fill();
+    ctx.fillStyle = n < game.p2.roundsWon ? '#ffd36a' : '#59636d'; ctx.beginPath(); ctx.arc(unitW - 10 - n * 14, 39, 4, 0, Math.PI * 2); ctx.fill();
+  }
+  if (game.round) { ctx.fillStyle = '#fff6d8'; ctx.font = 'bold 21px system-ui'; ctx.fillText(game.round, unitW / 2, 82); }
   ctx.restore();
 }
 
@@ -249,7 +299,6 @@ function loop(now) {
   if (!paused && game && intro.hidden) {
     accum += dt;
     for (let n = 0; accum >= 1000 / 60 && n < 5; n++) { step(); accum -= 1000 / 60; }
-    if (game.roundLeft <= 20) game.time = Math.max(0, game.time - dt * .06);
   }
   draw(); requestAnimationFrame(loop);
 }

js/runtime.js

@@ -98,6 +98,7 @@ export class Fighter {
     this.grounded = true; this.crouch = false; this.airJumps = 0; this.dirHistory = [];
     this.aiWait = 0; this.lastAI = 0;
     this.prevKeys = new Set();
+    this.roundsWon = 0;
     this.frame = this.currentFrame();
   }
   setAction(action, state = this.state) {
@@ -118,6 +119,19 @@ export class Fighter {
     }
     this.frame = this.currentFrame();
   }
+  resetRound() {
+    this.life = this.maxLife;
+    this.x = this.player ? -68 : 68;
+    this.y = this.vx = this.vy = 0;
+    this.facing = this.player ? 1 : -1;
+    this.state = 0; this.stateFrame = this.actionFrame = this.elemTick = 0;
+    this.hitstun = this.hitPause = this.hurtFlash = 0;
+    this.ctrl = true; this.grounded = true; this.crouch = false;
+    this.hit = null; this.hitDefs = []; this.prevKeys.clear(); this.dirHistory.length = 0;
+    this._power = 0;
+    this.setAction(0, 0);
+  }
+  resetMatch() { this.roundsWon = 0; this.resetRound(); }
   currentFrame() {
     const a = this.assets.actions.get(this.action);
     if (!a?.frames.length) return null;