@slugbugblue/trax 0.3.1 → 0.4.0

package/engine.js

@@ -1,4 +1,4 @@
-/* Copyright 2021 Chad Transtrum
+/* Copyright 2019-2022 Chad Transtrum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,16 +87,17 @@ const Trax = class {
     this.notation = ''
     this.tiles = {}
     this.path = []
-    this.count = 0
     this.invalid = false
     // moves might be a notation string
-    if (typeof moves === 'string') moves = moves.split(' ')
-    moves.forEach(move => {
-      if (typeof move === 'string') {
-        move = { move: this.move, notation: move }
-      }
-      this.play_move(move.move, move.notation)
-    })
+    if (moves) {
+      if (typeof moves === 'string') moves = moves.split(' ')
+      moves.forEach(move => {
+        if (typeof move === 'string') {
+          move = { move: this.move, notation: move }
+        }
+        this.play_move(move.move, move.notation)
+      })
+    }
   }
 
   save () { // in order to evaluate potential moves, we have to modify the state
@@ -111,7 +112,6 @@ const Trax = class {
       notation: this.notation,
       tiles: JSON.stringify(this.tiles),
       path: JSON.stringify(this.path),
-      count: this.count,
       invalid: this.invalid,
     }
   }
@@ -127,10 +127,13 @@ const Trax = class {
     this.notation = saved.notation
     this.tiles = JSON.parse(saved.tiles)
     this.path = JSON.parse(saved.path)
-    this.count = saved.count
     this.invalid = saved.invalid
   }
 
+  get count () {  // get the number of tiles currently in play
+    return Object.keys(this.tiles).length
+  }
+
   get color () {  // get the color of the current player (w or b)
     return color_of[this.turn]
   }
@@ -154,7 +157,6 @@ const Trax = class {
       this.invalid = true // invalid tile is being played
     } else {
       this.tiles[id] = tile
-      this.count++
       this.left = Math.min(this.left, x)
       this.right = Math.max(this.right, x)
       this.top = Math.min(this.top, y)
@@ -316,7 +318,6 @@ const Trax = class {
       tiles.forEach(tile => {
         if (winner) return // skip the remaining tiles once we find a win
         let ends = this.find_ends(color, tile.x, tile.y)
-        if (ends.length !== 2) return // this should never happen, but if it does, don't die
         if (ends[0].x === ends[1].x && ends[0].y === ends[1].y) {
           winner = color // loop win
           this.path = ends[0].path // both paths are essentially the same
@@ -391,7 +392,7 @@ const Trax = class {
         dropped.push(this.add_tile(type, x, y)) // play the tile
         dropped = dropped.concat(this.forced_moves(x, y)) // play all forced moves
         if (this.invalid || tentative) {
-          valid = false
+          if (this.invalid) valid = false
           this.restore(saved) // abort! abort!
         } else {
           this.check_win(dropped)
@@ -402,36 +403,42 @@ const Trax = class {
     return { dropped, notation, valid }
   }
 
-  rotate_move (move) { // symmetry helper, rotate a move around the board
+  move_rotations (move) { // symmetry helper, rotate a move around the board
     let match = move.match(notation_regex)
-    if (match === null) return move
-    let x = this.width + 1 - Number(match[2])
-    let y = decode_col(match[1])
-    let s = { '/': '\\', '\\': '/', '+': '+'}[match[3]]
-    return encode_col(x) + String(y) + s
-  }
-
-  provisional_notation (provisional) { // test a provisional move against the current state
-    let prov = provisional.split(';') // return false if the provisional move does not match
-    if (prov.length !== 4) return 'delete-provisional' // <-- if the provisional move is bad
-    let notation = false // otherwise, return the notation required to make the move
-    let rows = prov[1].split(':')
+    if (match === null) return []
+    let x = decode_col(match[1])
+    let y = Number(match[2])
+    let s = match[3]
+    let slashes = s === '+' ? [s] : ['/', '\\']
+    let moves = new Set()
+    // this isn't super precise, but it limits the search space ... maybe #TODO?
+    for (let slash of slashes) {
+      moves.add(encode_col(x) + String(y) + slash)
+      moves.add(encode_col(y) + String(x) + slash)
+      moves.add(encode_col(this.height - x + 1) + String(this.width - y + 1) + slash)
+      moves.add(encode_col(this.width - y + 1) + String(this.height -x + 1) + slash)
+    }
+    return [...moves]
+  }
+
+  provisional_move (from, to, via) { // test a provisional move against the current state
+    let rows = from.slice(1).split(':')
     let cols = rows.reduce((acc, cur) => Math.max(acc, code_row_len(cur)), 0)
     rows = rows.length
     if (this.width > rows && this.height > cols || this.width > cols && this.height > rows) {
       return 'delete-provisional' // current board is bigger than the provisional move
     }
-    if (prov[1] === this.normalized) {
-      let move = prov[2]
+    if (from === this.normalized) {
       let saved = this.save() // save this position
-      for (let i = 0 ; i < 4 && !notation; i++) { // try all four orientations because symmetry
-        this.drop_tile(move)
-        if (prov[3] === this.normalized) notation = move // this move matched!
-        this.restore(saved) // put the board back how it was
-        move = this.rotate_move(move) // rotate to the next orientation
+      for (let move of this.move_rotations(via)) { // try all symmetrical moves
+        let drop = this.drop_tile(move)
+        if (drop.valid) {
+          if (to === this.normalized) return move  // this move matched!
+          this.restore(saved) // put the board back how it was
+        }
       }
     }
-    return notation
+    return false
   }
 
   get icon () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slugbugblue/trax",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Trax game engine and friends",
   "keywords": [
     "trax",
@@ -14,13 +14,14 @@
   "exports": "./engine.js",
   "repository": "gitlab:slugbugblue/trax",
   "scripts": {
-    "test": "tape tests.js",
+    "test": "c8 tap --no-coverage",
     "preversion": "npm test",
     "postversion": "git push && git push --tags"
   },
   "devDependencies": {
-    "eslint": "8.x",
-    "tape": "5.x"
+    "c8": "^7.11.0",
+    "eslint": "^8.7.0",
+    "tap": "^15.1.6"
   },
   "type": "module",
   "engines": {

package/tests.js

@@ -1,11 +0,0 @@
-import test from 'tape'
-import Trax from './engine.js'
-
-test('create trax game', t => {
-  let trax = new Trax('trax', '@0/', 'tape')
-  t.equal(trax.id, 'tape', 'id is assigned')
-  t.equal(trax.count, 1, '1 tile is played')
-  t.equal(trax.turn, 2, 'player 2 is next')
-  t.equal(trax.color, 'b', 'player 2 is black')
-  t.end()
-})