fix recorder

src/controller/replay.ts

@@ -22,7 +22,6 @@ export class Replay extends ControllerBase {
     this.delay = delay
     this.container.table.showTraces(true)
     this.container.table.updateFromShortSerialised(this.init)
-    console.log(shots)
     if (retry) {
       const retryEvent = new BreakEvent(init, shots)
       retryEvent.retry = true
@@ -38,10 +37,9 @@ export class Replay extends ControllerBase {
 
     if (shot?.type === EventType.RERACK) {
       const rerack = RerackEvent.fromJson((shot as RerackEvent).ballinfo)
-      console.log(rerack)
       rerack.applyToController(this)
       if (this.shots.length > 0) {
-        return this.playNextShot(delay)
+        this.playNextShot(delay)
       }
       return
     }

src/model/ball.ts

@@ -122,7 +122,12 @@ export class Ball {
   }
 
   serialise() {
-    return { pos: this.pos, vel: this.vel, rvel: this.rvel, state: this.state }
+    return {
+      pos: this.pos.clone(),
+      vel: this.vel,
+      rvel: this.rvel,
+      state: this.state,
+    }
   }
 
   static fromSerialised(data) {

src/utils/rack.ts

@@ -68,22 +68,19 @@ export class Rack {
     const triangle: Vector3[] = []
     const pos = new Vector3(TableGeometry.tableX / 2, 0, 0)
     triangle.push(vec(pos))
-    //
+    // row 2
     pos.add(this.diagonal)
     triangle.push(vec(pos))
     pos.sub(this.across)
     triangle.push(vec(pos))
-    if (triangle.length === 3) {
-      return triangle
-    }
-
-    pos.add(this.diagonal).sub(this.across)
+    // row 3
+    pos.add(this.diagonal)
     triangle.push(vec(pos))
-    pos.add(this.across)
+    pos.sub(this.across)
     triangle.push(vec(pos))
-    pos.add(this.across)
+    pos.addScaledVector(this.across, 2)
     triangle.push(vec(pos))
-    //
+    // row 4
     pos.add(this.diagonal)
     triangle.push(vec(pos))
     pos.sub(this.across)
@@ -92,7 +89,7 @@ export class Rack {
     triangle.push(vec(pos))
     pos.sub(this.across)
     triangle.push(vec(pos))
-    //
+    // row 5
     pos.add(this.diagonal).sub(this.across)
     triangle.push(vec(pos))
     pos.add(this.across)
@@ -104,7 +101,7 @@ export class Rack {
     pos.add(this.across)
     triangle.push(vec(pos))
 
-    return triangle.slice(0, 3)
+    return triangle.slice(0, 4)
   }
 
   static rerack(key: Ball, table: Table) {

test/rules/fourteenone.spec.ts

@@ -40,7 +40,7 @@ describe("FourteenOne", () => {
   })
 
   it("Fourteenone has 16 balls", (done) => {
-    expect(container.table.balls).to.be.length(4)
+    expect(container.table.balls).to.be.length(5)
     done()
   })
 
@@ -66,8 +66,9 @@ describe("FourteenOne", () => {
       balls[i].pos.copy(PocketGeometry.pockets.pocketS.pocket.pos)
       balls[i].state = State.InPocket
     }
-    balls[0].pos.copy(new Vector3(0, edge + R * 2, 0))
-    balls[1].pos.copy(new Vector3(0, edge, 0))
+    balls[0].pos.copy(new Vector3(0, edge + R * 4.2, 0))
+    balls[1].pos.copy(new Vector3(0, edge + R * 2.1, 0))
+    balls[2].pos.copy(new Vector3(0, edge, 0))
   }
 
   function playShotWaitForOutcome() {
@@ -117,13 +118,18 @@ describe("FourteenOne", () => {
     expect(watchEvent.json.rerack).to.be.true
     expect(container.recoder.shots[1].type).to.be.equal("RERACK")
 
-    // play second hit (cueball into pocket)
+    const before = JSON.stringify(container.recoder.shots[1])
+
+    // play second pot
     container.advance(1)
     container.processEvents()
     playShotWaitForOutcome()
     container.advance(1)
     container.processEvents()
-    expect(container.controller).to.be.an.instanceof(PlaceBall)
+    expect(container.controller).to.be.an.instanceof(Aim)
+
+    const after = JSON.stringify(container.recoder.shots[1])
+    expect(before).to.be.equal(after)
     done()
   })
 })