score

tailuge · Nov 18, 2023 · 9d0b48b · 9d0b48b
1 parent 35eb26b
commit 9d0b48b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/dist/diagram.js b/dist/diagram.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/controller/rules/nineball.ts b/src/controller/rules/nineball.ts
@@ -25,6 +25,7 @@ export class NineBall implements Rules {
   cueball: Ball
   currentBreak = 0
   previousBreak = 0
+  score = 0
 
   constructor(container) {
     this.container = container
@@ -81,7 +82,9 @@ export class NineBall implements Rules {
       return new WatchAim(this.container)
     }
     if (Outcome.isBallPottedNoFoul(table.cueball, outcome)) {
-      this.currentBreak += Outcome.potCount(outcome)
+      const pots = Outcome.potCount(outcome)
+      this.currentBreak += pots
+      this.score += pots
       this.container.sound.playSuccess(table.inPockets())
       if (this.isEndOfGame(outcome)) {
         this.container.eventQueue.push(new ChatEvent(null, `game over`))

diff --git a/src/controller/rules/rules.ts b/src/controller/rules/rules.ts
@@ -8,6 +8,7 @@ export interface Rules {
   cueball: Ball
   currentBreak: number
   previousBreak: number
+  score: number
   update(outcome: Outcome[]): Controller
   rack(): Ball[]
   tableGeometry()

diff --git a/src/controller/rules/snooker.ts b/src/controller/rules/snooker.ts
@@ -26,6 +26,7 @@ export class Snooker implements Rules {
   currentBreak = 0
   previousBreak = 0
   foulPoints = 0
+  score = 0
 
   static readonly tablemodel = "models/snooker.min.gltf"
 
@@ -181,6 +182,7 @@ export class Snooker implements Rules {
     this.previousPotRed = false
     this.targetIsRed = SnookerUtils.redsOnTable(this.container.table).length > 0
     this.previousBreak = this.currentBreak
+    this.score += this.currentBreak
     this.currentBreak = 0
     this.container.hud.updateBreak(this.currentBreak)
   }

diff --git a/src/controller/rules/threecushion.ts b/src/controller/rules/threecushion.ts
@@ -22,6 +22,7 @@ export class ThreeCushion implements Rules {
   cueball: Ball
   currentBreak = 0
   previousBreak = 0
+  score = 0
 
   constructor(container) {
     this.container = container
@@ -74,6 +75,8 @@ export class ThreeCushion implements Rules {
     if (Outcome.isThreeCushionPoint(this.cueball, outcomes)) {
       this.container.sound.playSuccess(outcomes.length / 3)
       this.container.sendEvent(new WatchEvent(this.container.table.serialise()))
+      this.currentBreak++
+      this.score++
       return new Aim(this.container)
     }
 

diff --git a/src/events/recorder.ts b/src/events/recorder.ts
@@ -35,7 +35,13 @@ export class Recorder {
   }
 
   wholeGame() {
-    return this.state(this.states[0], this.shots, this.start, 0, true)
+    return this.state(
+      this.states[0],
+      this.shots,
+      this.start,
+      this.container.rules.score,
+      true
+    )
   }
 
   last() {