simplify

tailuge · Nov 19, 2023 · c18bd4b · c18bd4b
1 parent 7dae401
commit c18bd4b
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 22 deletions.
diff --git a/dist/diagram.js b/dist/diagram.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "@testing-library/dom": "^9.3.3",
     "@types/chai": "^4.3.10",
     "@types/jest": "^29.5.8",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.9.2",
     "@types/three": "^0.158.2",
     "chai": "^4.3.10",
     "ini": "^4.1.1",

diff --git a/src/controller/rules/snooker.ts b/src/controller/rules/snooker.ts
@@ -111,27 +111,37 @@ export class Snooker implements Rules {
     // exactly one non red potted
 
     const id = Outcome.pots(outcome)[0].id
-    if (!this.previousPotRed) {
-      const lesserBallOnTable =
-        SnookerUtils.coloursOnTable(this.container.table).filter(
-          (b) => b.id < id
-        ).length > 0
-
-      if (!info.legalFirstCollision || lesserBallOnTable) {
-        this.foulPoints = this.foulCalculation(outcome, info)
-        this.respot(outcome)
-        return this.switchPlayer()
-      }
+    console.log(info)
+    if (id !== info.firstCollision.ballB.id) {
+      return this.foul(outcome, info)
     }
+
     if (this.previousPotRed) {
       this.respot(outcome)
+      this.currentBreak += id + 1
+      this.previousPotRed = false
+      return this.continueBreak()
     }
+
+    const lesserBallOnTable =
+      SnookerUtils.coloursOnTable(this.container.table).filter((b) => b.id < id)
+        .length > 0
+
+    if (lesserBallOnTable) {
+      return this.foul(outcome, info)
+    }
+
     this.currentBreak += id + 1
     this.previousPotRed = false
-    this.container.hud.updateBreak(this.currentBreak)
     return this.continueBreak()
   }
 
+  foul(outcome, info) {
+    this.foulPoints = this.foulCalculation(outcome, info)
+    this.respot(outcome)
+    return this.switchPlayer()
+  }
+
   foulCalculation(outcome, info) {
     const potted = Outcome.pots(outcome)
       .map((b) => b.id)
@@ -235,6 +245,7 @@ export class Snooker implements Rules {
   }
 
   continueBreak() {
+    this.container.hud.updateBreak(this.currentBreak)
     const table = this.container.table
     this.container.sound.playSuccess(table.inPockets())
     if (Outcome.isClearTable(table)) {

diff --git a/src/controller/rules/snookerutils.ts b/src/controller/rules/snookerutils.ts
@@ -22,12 +22,12 @@ export class SnookerUtils {
       return false
     }
     const id = firstCollision.ballB!.id
-    const lesserBallOnTable =
-      SnookerUtils.coloursOnTable(table).filter((b) => b.id < id).length > 0
     if (targetIsRed) {
       const isRed = id >= 7
       return isRed
     }
+    const lesserBallOnTable =
+      SnookerUtils.coloursOnTable(table).filter((b) => b.id < id).length > 0
     return !lesserBallOnTable
   }
 

diff --git a/test/rules/snooker.spec.ts b/test/rules/snooker.spec.ts
@@ -270,6 +270,21 @@ describe("Snooker", () => {
     done()
   })
 
+  it("hit black but pot pink is foul", (done) => {
+    snooker.targetIsRed = false
+    snooker.previousPotRed = true
+    const outcome: Outcome[] = []
+    outcome.push(Outcome.hit(table.cueball, 1))
+    outcome.push(Outcome.collision(table.cueball, table.balls[6], 1))
+    outcome.push(Outcome.collision(table.cueball, table.balls[5], 1))
+    outcome.push(Outcome.pot(table.balls[5], 1))
+    table.balls[5].state = State.InPocket
+    snooker.update(outcome)
+    expect(snooker.targetIsRed).to.be.true
+    expect(snooker.foulPoints).to.be.equal(7)
+    done()
+  })
+
   it("target is red but hit pink is foul", (done) => {
     const outcome: Outcome[] = []
     outcome.push(Outcome.hit(table.cueball, 1))

diff --git a/yarn.lock b/yarn.lock
@@ -936,10 +936,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^20.9.1":
-  version "20.9.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.1.tgz#9d578c610ce1e984adda087f685ace940954fe19"
-  integrity sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==
+"@types/node@*", "@types/node@^20.9.2":
+  version "20.9.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.2.tgz#002815c8e87fe0c9369121c78b52e800fadc0ac6"
+  integrity sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==
   dependencies:
     undici-types "~5.26.4"