Merge pull request #50 from bownie/master

history colouring
tailuge · Nov 15, 2023 · d9cb62d · d9cb62d
2 parents 107a675 + 2c14c5c
commit d9cb62d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/dist/index.css b/dist/index.css
@@ -46,8 +46,8 @@ p {
 
 #snookerScoreOverlay {
   position: absolute;
-  bottom: 0.5em;
-  right: 0.5em;
+     bottom: 1em;
+     right: 3em;
 }
 
 .view3d {

diff --git a/src/controller/rules/snooker.ts b/src/controller/rules/snooker.ts
@@ -235,7 +235,6 @@ export class Snooker implements Rules {
   continueBreak() {
     const table = this.container.table
     this.container.sound.playSuccess(table.inPockets())
-    console.log(this.currentBreak)
     if (Outcome.isClearTable(table)) {
       this.container.eventQueue.push(new ChatEvent(null, `game over`))
       this.container.recorder.wholeGameLink()

diff --git a/src/events/recorder.ts b/src/events/recorder.ts
@@ -80,7 +80,7 @@ export class Recorder {
       this.breakLink(isEndOfGame)
     }
 
-    this.lastShotLink(isPartOfBreak || isEndOfGame, potCount)
+    this.lastShotLink(isPartOfBreak || isEndOfGame, potCount, Outcome.pots(outcome))
 
     if (isEndOfGame) {
       this.breakLink(isEndOfGame)
@@ -97,16 +97,24 @@ export class Recorder {
     }
   }
 
-  lastShotLink(isPartOfBreak, potCount) {
+  lastShotLink(isPartOfBreak, potCount, balls) {
     const pots = potCount > 1 ? potCount - 1 : 0
     const breakPoints =
       this.container.rules.currentBreak > 0
         ? " " + this.container.rules.currentBreak
         : ""
+
+    var colourString = "#000000"    
+    if (balls.length > 0) {
+      balls.forEach(element => {
+        colourString = "#" + element.ballmesh.color.getHexString()
+      });
+    }
+
     const shotIcon =
       "⚈".repeat(pots) + (isPartOfBreak ? "⚈" : "⚆") + breakPoints
     const serialisedShot = JSON.stringify(this.lastShot())
-    this.generateLink(shotIcon, serialisedShot)
+    this.generateLink(shotIcon, serialisedShot, colourString)
   }
 
   breakLink(includeLastShot) {
@@ -127,20 +135,21 @@ export class Recorder {
     const text = `break(${breakScore})`
     const serialisedShot = JSON.stringify(currentBreak)
     const compressed = JSONCrush.crush(serialisedShot)
-    this.generateLink(text, compressed)
+    this.generateLink(text, compressed, "black")
   }
 
   wholeGameLink() {
     const game = this.wholeGame()
     const text = `frame(${game.shots.length} shots)`
     const serialisedGame = JSON.stringify(game)
     const compressed = JSONCrush.crush(serialisedGame)
-    this.generateLink(text, compressed)
+    this.generateLink(text, compressed, "black")
   }
 
-  private generateLink(text, state) {
+
+  private generateLink(text, state, colour) {
     const shotUri = `${this.replayUrl}${encodeURIComponent(state)}`
-    const shotLink = `<a class="pill" target="_blank" href="${shotUri}">${text}</a>`
+    const shotLink = `<a class="pill" style="color: ${colour}" target="_blank" href="${shotUri}">${text}</a>`
     this.container.eventQueue.push(new ChatEvent(null, `${shotLink}`))
   }
 }
diff --git a/src/view/hud.ts b/src/view/hud.ts
@@ -1,8 +1,5 @@
 export class Hud {
   element: HTMLDivElement
-  current_break: HTMLStyleElement
-
-  disabled = true
 
   constructor() {
     this.element = this.getElement("snookerScore")